Converted various controls from services to factories to track scope.