Popover minor fixes; formatting