Merging CSS and popover bug fix from master branch