simplified popover markup; fixes to existing popovers with var renames