GUI-1119

incorporated much UX input and code review feedback