Updated views and controllers.