Completed controller and views