tidy up ui white space and fix popover text