updates to controller and view