diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 91acd64f..bed45aaf 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container>
-    <!-- <div>
+    <div>
       READY: {{ formState.ready }}
       <br />
       LOADING: {{ formState.loading }}
@@ -11,27 +11,9 @@
       <br />
       READONLY: {{ formState.readOnly }}
       <br />
-    </div> -->
-    <!--   <div>
-      ListViewId: {{ listViewId }}
-      <v-divider></v-divider>
-      <br />
-      DataListKey: {{ dataListKey }}
-      <v-divider></v-divider>
-      <br />
-      FormKey: {{ formKey }}
-      <v-divider></v-divider>
-      <br />
-       fieldDefinitions: {{ fieldDefinitions }}
-      <v-divider></v-divider>
-      <br /> 
-      effectiveListView: {{ effectiveListView }}
-      <v-divider></v-divider>
-      <br />
-      obj: {{ obj }}
-      <v-divider></v-divider>
     </div>
--->
+    <!--  -->
+
     <v-row v-if="this.formState.ready">
       <v-col>
         <v-form ref="form">
@@ -487,6 +469,7 @@ export default {
         generateMenu(vm, false); //default is never read only and passing in this vm
         //init disable save button so it can be enabled only on edit to show dirty form
         window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+        vm.formState.loading = false;
       })
       .catch(err => {
         //console.log("CREATED: ERROR back from initform with error");
@@ -497,7 +480,6 @@ export default {
   data() {
     return {
       obj: { editView: [], name: "", public: true },
-
       listViewId: undefined,
       dataListKey: undefined,
       formKey: undefined,
@@ -549,7 +531,10 @@ export default {
       if (item.required && item.visible == false) {
         item.required = false;
       }
-      updateEditedListView(this);
+      window.$gz.form.setFormState({
+        vm: this,
+        dirty: true
+      });
     },
     toggleSort: function(item) {
       if (item.sort == null) {
@@ -563,7 +548,10 @@ export default {
       if (item.sort) {
         item.include = true;
       }
-      updateEditedListView(this);
+      window.$gz.form.setFormState({
+        vm: this,
+        dirty: true
+      });
     },
     move: function(direction, index) {
       var totalItems = this.obj.editView.length;
@@ -596,7 +584,10 @@ export default {
         0,
         this.obj.editView.splice(index, 1)[0]
       );
-      updateEditedListView(this);
+      window.$gz.form.setFormState({
+        vm: this,
+        dirty: true
+      });
     },
     addFilterCondition(item) {
       var filterItem = { op: null, value: null, display: null };
@@ -712,14 +703,20 @@ export default {
         //add only if not already in the collection (accidental double click)
         if (!window.$gz._.find(item.filter.items, filterItem)) {
           item.filter.items.push(filterItem);
-          updateEditedListView(this);
+          window.$gz.form.setFormState({
+            vm: this,
+            dirty: true
+          });
         }
         return;
       }
     },
     removeFilterCondition(item, index) {
       item.filter.items.splice(index, 1);
-      updateEditedListView(this);
+      window.$gz.form.setFormState({
+        vm: this,
+        dirty: true
+      });
     },
     form() {
       return window.$gz.form;