More ng-model tags and cleanup