updated controller and views