fixed up some of the views and added new controllers