Organized templates and renamed some view method names