Updated controller and edited views