Updated templates controller and views