More ui changes
2 panels called scenePanel. Fixed.
Merge