* Minor refactoring of base views
* Modified template to be vulnerable