Moved ng-model to the proper location