Updated all the views and controllers to actually work