ng-repeat changed to collection-repeat + necessary adjustments