GUI-1119
fixed several UX concerns