updates to controller and views