Updated templates and view controller of the application