updated controller, layaout, show view