Improved styles and added basic popover