Added ng-if statements