Changes in Template views and controller