GUI-1271
UX and code review fixes