tidy up ui white space and fix popover text

@lukecampbell we might want to merge and test this out today