Updated specs, controllers, routes and views