layout refactor
changing layout to set a class, precursor to setting only one layout
remove the concept of Dashboard-content and sidebar-content

Some more layout refactoring