Move ng-ifs to proper tags for errors