Smarter layout

* Fixed positioning of panels
* Better use of drag and drop
BUG: Fix rendering on save