GUI-1206: Misc fixes based on UX review