Fix csslint again
Remove redundant views
Fixes after refactoring views
Restructure HTML to reflect the new layout