Popover ui changes and misc