disabled persistantPopover
 and restructured.