Updated specs, views, controllers, and controllers