diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 2556312b..7b15d4e9 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -65,11 +65,7 @@ CURRENT TODOs
 @@@@@@@@@@@ ROADMAP STAGE 2:
 
 
-todo: Not sure I like not being able to logout from a widget edit form
-	- put back?
-	- Put in nav menu to left (seems logical that way) and remove from any other menu
-		- as bottom option
-		
+
 todo: Test widget form as bizamdinlimited read only mode because I think several things are not right in read only mode
 	- remove clear button and option if read only
 	- make sure can't use any of the controls the make changes
diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index 75ef5d7f..8e95ca5d 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -19,7 +19,7 @@
             <div v-if="item.type === 1">
               <gz-date-time-picker
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -39,7 +39,7 @@
             <div v-else-if="item.type === 2">
               <gz-date-picker
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -58,7 +58,7 @@
             <div v-else-if="item.type === 3">
               <gz-time-picker
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -77,7 +77,7 @@
             <div v-else-if="item.type === 4">
               <v-textarea
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -91,14 +91,14 @@
                   )
                 ]"
                 auto-grow
-                clearable
+                :clearable="!readonly"
               ></v-textarea>
             </div>
             <!-- INTEGER -->
             <div v-else-if="item.type === 5">
               <v-text-field
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -111,7 +111,7 @@
                     $ay.t(item.fld)
                   )
                 ]"
-                clearable
+                :clearable="!readonly"
                 :counter="10"
                 type="number"
                 step="none"
@@ -121,7 +121,7 @@
             <div v-else-if="item.type === 6">
               <v-checkbox
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -140,7 +140,7 @@
             <div v-else-if="item.type === 7">
               <gz-decimal
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -159,7 +159,7 @@
             <div v-else-if="item.type === 8">
               <gz-currency
                 v-model="_self[item.dataKey]"
-                :readonly="readOnly"
+                :readonly="readonly"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
                 :data-cy="!!$ay.dev ? item.fld : false"
@@ -201,7 +201,7 @@ export default {
       type: String
     },
     formKey: String, //used to grab template from store
-    readOnly: Boolean,
+    readonly: Boolean,
     parentVM: Object
   },
 
@@ -213,7 +213,7 @@ export default {
     fieldValueChanged(ref) {
       if (
         !this.parentVM.formState.loading &&
-        !this.parentVM.formState.readOnly
+        !this.parentVM.formState.readonly
       ) {
         window.$gz.form.fieldValueChanged(this.parentVM, ref);
       }
diff --git a/ayanova/src/components/pick-list.vue b/ayanova/src/components/pick-list.vue
index 8a36eb52..29f7561c 100644
--- a/ayanova/src/components/pick-list.vue
+++ b/ayanova/src/components/pick-list.vue
@@ -3,6 +3,7 @@
     <v-autocomplete
       v-bind:value="value"
       v-on:input="selectionMade($event)"
+      :readonly="readonly"
       return-object
       :items="searchResults"
       :label="label"
@@ -15,7 +16,7 @@
       :search-input.sync="searchEntry"
       :filter="customFilter"
       hide-no-data
-      clearable
+      :clearable="!readonly"
       :no-filter="isTagFilter"
       :append-icon="errorIcon"
       @click:append="handleErrorClick"
@@ -60,6 +61,7 @@ export default {
       type: Number,
       default: null
     },
+    readonly: { type: Boolean, default: false },
     ayaType: {
       type: Number,
       default: 0
diff --git a/ayanova/src/components/tag-picker.vue b/ayanova/src/components/tag-picker.vue
index bc369ba0..30f6c1f3 100644
--- a/ayanova/src/components/tag-picker.vue
+++ b/ayanova/src/components/tag-picker.vue
@@ -6,6 +6,7 @@
     <v-autocomplete
       v-bind:value="value"
       v-on:input="$emit('input', $event)"
+      :readonly="readonly"
       :items="sourcetags"
       :loading="tagSearchUnderway"
       :placeholder="$ay.t('TypeToSearchOrAdd')"
@@ -67,7 +68,8 @@ export default {
     };
   },
   props: {
-    value: Array
+    value: Array,
+    readonly: { type: Boolean, default: false }
   },
   watch: {
     tagSearchEntry(val) {
diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
index 332f0fbd..e5319649 100644
--- a/ayanova/src/components/wiki-control.vue
+++ b/ayanova/src/components/wiki-control.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <template v-if="readOnly">
+    <template v-if="readonly">
       <div>
         <v-btn depressed tile @click="switchView()">
           Wiki<v-icon right>{{ switchViewIcon() }}</v-icon></v-btn
@@ -387,7 +387,7 @@ export default {
   },
   props: {
     value: String,
-    readOnly: Boolean,
+    readonly: Boolean,
     attachments: Array
   },
   watch: {
@@ -528,7 +528,7 @@ export default {
       //return the icon that indicates what it will change to if you click it
       //mirror of switchview below
 
-      if (this.readOnly) {
+      if (this.readonly) {
         if (this.currentView == this.view.HIDDEN_VIEW) {
           return "fa-eye";
         } else {
@@ -562,7 +562,7 @@ export default {
     },
     switchView() {
       //if user can't edit then cycle between hidden and wiki view
-      if (this.readOnly) {
+      if (this.readonly) {
         if (this.currentView == this.view.HIDDEN_VIEW) {
           this.currentView = this.view.WIKI_VIEW;
         } else {
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index bc841c22..5b69e00c 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -10,7 +10,7 @@
               <v-text-field
                 v-model="obj.name"
                 :readonly="formState.readOnly"
-                clearable
+                :clearable="!formState.readOnly"
                 @click:clear="fieldValueChanged('name')"
                 :counter="255"
                 :label="$ay.t('WidgetName')"
@@ -48,7 +48,7 @@
               <v-text-field
                 v-model="obj.count"
                 :readonly="formState.readOnly"
-                clearable
+                :clearable="!formState.readOnly"
                 @click:clear="fieldValueChanged('count')"
                 :counter="10"
                 :label="$ay.t('WidgetCount')"
@@ -169,7 +169,7 @@
 
             <v-col v-if="form().showMe(this, 'Notes')" cols="12">
               <v-textarea
-                v-model="obj.notes"
+                v-model="obj.notes"                
                 :readonly="formState.readOnly"
                 :label="$ay.t('WidgetNotes')"
                 :error-messages="form().serverErrors(this, 'notes')"
@@ -177,7 +177,7 @@
                 :data-cy="!!$ay.dev ? 'notes' : false"
                 @input="fieldValueChanged('notes')"
                 auto-grow
-                clearable
+                :clearable="!formState.readOnly"
               ></v-textarea>
             </v-col>
 
@@ -196,7 +196,7 @@
               <gz-custom-fields
                 v-model="obj.customFields"
                 :formKey="formCustomTemplateKey"
-                :readOnly="formState.readOnly"
+                :readonly="formState.readOnly"
                 :parentVM="this"
                 ref="customFields"
                 :data-cy="!!$ay.dev ? 'customFields' : false"
@@ -209,7 +209,7 @@
               <gz-wiki
                 ref="wiki"
                 v-model="obj.wiki"
-                :readOnly="formState.readOnly"
+                :readonly="formState.readOnly"
                 :parentVM="this"
                 @input="fieldValueChanged('wiki')"
               ></gz-wiki