diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index a53310fe..ab8007da 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -56,9 +56,14 @@ TODO: Form customization - hidden fields support
 	- Obviously not the required ones (how to know if required?)
 
 
-TODO: Any other widget form stuff, then do a on server test (bump version) then can proceed 
 
 
+TODO: TESTING - Post to server then do a round of device testing
+	- bump server version first!!
+
+
+................................
+
 
 TODO: MOVE THIS DOWN?  AFTER ALL WIDGET FORM STUFF IS DONE Form customize UI
 	- Where you create custom fields and edit 
@@ -69,8 +74,11 @@ TODO: MOVE THIS DOWN?  AFTER ALL WIDGET FORM STUFF IS DONE Form customize UI
 
 TODO: Bug?  Set widget edit form times to 4:20pm and observe that in the main grid list it shows as 320 pm!?
 
-TODO: BUG?  If I open a widget record, make no changes just click on another navigation item like operations console, instead of navigating I get an error about object did not pass validation and it stays on that page	
-	- It's trying to open this url: https://test.helloayanova.com/inventory/widget/edit/ops  for some reason tagging ops on to the current route, not replacing the route entirely
+TODO: Main list hide hidden fields as well???
+	- If a field is hideable and hidden then it probably shouldn't display on the main list either
+	- Test with widget Serial field as before
+
+
 
 TODO (NEEDS re-test ON MOBILE for appearance and functionality): Reports - stub out
 	- Stub out some fake reports in a drop down selection for testing, doesn't have to do anything but be present
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index 4b0a4e93..33f910a6 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -54,7 +54,13 @@
                 @change="onChange('serial')"
               ></v-text-field>
             </v-col>
-            <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-col
+              v-if="form().showMe(this, 'WidgetCount')"
+              cols="12"
+              sm="6"
+              lg="4"
+              xl="3"
+            >
               <v-text-field
                 v-model="obj.count"
                 :readonly="this.formState.readOnly"
@@ -74,7 +80,13 @@
               ></v-text-field>
             </v-col>
 
-            <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-col
+              v-if="form().showMe(this, 'WidgetDollarAmount')"
+              cols="12"
+              sm="6"
+              lg="4"
+              xl="3"
+            >
               <v-text-field
                 v-model="obj.dollarAmount"
                 :readonly="this.formState.readOnly"
@@ -114,7 +126,13 @@
                 @change="onChange('endDate')"
               ></gz-date-time-picker>
             </v-col>
-            <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-col
+              v-if="form().showMe(this, 'Active')"
+              cols="12"
+              sm="6"
+              lg="4"
+              xl="3"
+            >
               <v-checkbox
                 v-model="obj.active"
                 :readonly="this.formState.readOnly"
@@ -125,7 +143,13 @@
                 @change="onChange('active')"
               ></v-checkbox>
             </v-col>
-            <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-col
+              v-if="form().showMe(this, 'WidgetRoles')"
+              cols="12"
+              sm="6"
+              lg="4"
+              xl="3"
+            >
               <v-select
                 v-model="obj.roles"
                 :items="pickLists.roles"
@@ -144,7 +168,7 @@
               ></v-select>
             </v-col>
 
-            <v-col cols="12">
+            <v-col v-if="form().showMe(this, 'WidgetNotes')" cols="12">
               <v-textarea
                 v-model="obj.notes"
                 :readonly="this.formState.readOnly"
@@ -160,7 +184,7 @@
               ></v-textarea>
             </v-col>
 
-            <v-col cols="12">
+            <v-col v-if="form().showMe(this, 'Tags')" cols="12">
               <gz-tag-picker
                 v-model="obj.tags"
                 :readonly="this.formState.readOnly"