fixed angular bracket bug and fixing ng-if statements