Added named views
Refactored the template