Issue/#345

Fixes #345 and a few more improvements to the UI and sidebar views for the editor.

The sidebar views are a little dumb at the moment.