Improve popover :D