Drawer & popover fixes;