Bug Fixes
Popover cleanup