Updated specs, views, models and controllers