changes to controllers and views