Updated controllers, views and specs