Updated to have the popover template fix