UI inconsistencies - Part 2