updated controller, database, views