begin fixing ng-if statements