Change popovers for forms & Fix #BB-667
Fix #BB-666 kill the Beast!
Fixes #BB-665
Partly fixes #BB-664