SWITCHYARD-1782 - Fixing issues from UX usability review