Controller and Views update 3