GUI-1088
last UX cleanup?