UI inconsistencies - Part 2

@TLI
As we only have the one for UI