Start refactoring views
Start theming