Additions to the view, and changes on the controller to work with the new view