More refactoring (chart and workbench now work)
Top level container varies b/w workbench and single view