refactoring views
finished views/templates refactor