Fixed ng-model issues