Remove extra p formatting, fix php syntax in popover include