(Cal) Fix popover display problems