UI Updates Round 2

@Kelketek Yup, the spec doesn't talk about this case, but since the feature is in the code it's better to not introduce inconsistencies that would confuse the user if we ended up letting things as is.