GUI-1088

updates from UX review