Updated the view and the template