Further refactor views and template methods