GUI-335

implemented many changes requested by UX review. More to come