General clean up. Using a ng-repeat now for the switches widget