View templating
minor
Refactoring all views to use template
Still refactoring views