Getting the layout back to where it was for the main inner page
Merge branch 'baseline'
Merge conflicts merge conflicts
Removed unused css files