Layoutmerge

I merged in the changes by Victor (cleaning up stuff) and my layout changes. 
Additionally I added a sidebar view (as the changed structure required an el whose subtree contained the sidebar toggle button (which the graphview el didnt). 

Please suggest changes and improve on this version!