view/template refactoring and renaming