Fix frame borders
Tweak things
Popover fixes
* Merge fix.