GUI-1199
UX feedback tweaks