UI inconsistencies - Part 2

@TLI

Will you open one?