Added/Altered both views and controllers.