Fix popover positioning and remove hack