Updated Goals Controller and Views