Fixed some layout issues and enabled popover