diff --git a/ayanova/src/components/tax-picker.vue b/ayanova/src/components/tax-picker.vue
index 48b910ad..58f80f42 100644
--- a/ayanova/src/components/tax-picker.vue
+++ b/ayanova/src/components/tax-picker.vue
@@ -14,8 +14,15 @@
       ></gz-pick-list>
     </template>
     <template v-else>
-      <v-btn @click="picking = true">edit</v-btn>
-      {{ display }}
+      <div class="mb-n2 ml-10">
+        <span class="text-caption">{{ label }}</span>
+      </div>
+      <div class="mb-6 mb-sm-0">
+        <v-btn icon class="ml-n1 mr-2" @click="picking = true">
+          <v-icon>$ayiEdit</v-icon>
+        </v-btn>
+        <span @click="picking = true">{{ display }}</span>
+      </div>
     </template>
   </div>
 </template>
@@ -23,7 +30,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 /*  XXXeslint-disable    */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+//Note: not perfect detection of lost focus
 export default {
   data() {
     return {
@@ -63,6 +70,11 @@ export default {
     canClear: { type: Boolean, default: true },
     label: { type: String, default: "" }
   },
+  watch: {
+    display() {
+      this.picking = false; //this is to attempt to make the picker go away when the record changes to another, otherwise it seems to stick
+    }
+  },
 
   methods: {
     emitInput(e) {
diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index 7072dea8..355abcd1 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -8,7 +8,7 @@
         <v-btn icon class="ml-n1 mr-2" @click="openDialog = true">
           <v-icon>$ayiEdit</v-icon>
         </v-btn>
-        <span>{{ displayServiceAddress }}</span>
+        <span @click="openDialog = true">{{ displayServiceAddress }}</span>
       </div>
     </template>
     <v-row justify="center">
diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue
index b9cb5d1b..0af0e095 100644
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -344,7 +344,7 @@
           ></gz-tax-picker>
         </v-col>
 
-        <v-col
+        <!-- <v-col
           v-if="form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID')"
           cols="12"
           sm="6"
@@ -378,7 +378,7 @@
             "
             @update:name="taxCodeChange"
           ></gz-pick-list>
-        </v-col>
+        </v-col> -->
 
         <v-col
           v-if="form().showMe(this, 'LaborPrice')"
diff --git a/ayanova/src/components/work-order-state.vue b/ayanova/src/components/work-order-state.vue
index cb4a6ed5..fea7cf94 100644
--- a/ayanova/src/components/work-order-state.vue
+++ b/ayanova/src/components/work-order-state.vue
@@ -10,7 +10,9 @@
           <v-icon>{{ openIcon() }}</v-icon>
         </v-btn>
 
-        <span class="text-h6">{{ pvm.currentState.name }}</span>
+        <span class="text-h6" @click="openDialog = true">{{
+          pvm.currentState.name
+        }}</span>
         <v-icon :color="pvm.currentState.color" class="ml-4">$ayiFlag</v-icon>
         <v-icon color="primary" v-if="pvm.currentState.locked" class="ml-4"
           >$ayiLock</v-icon