Changed some ng-shog/ng-hide to ng-if