Merged show and edit into one view and one sidebar, new layout for show/edit pages