Added all views, fixes in controllers.