changed controller, model, and two views