diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index f37fd66b..5818d4de 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -16,7 +16,15 @@
     <div>
       <v-row align-center justify-left row wrap>
         <template v-for="item in this.$store.state.formCustomTemplate[formKey]">
-          <v-col v-if="item.type" :key="item.fld" cols="12" sm6 lg4 xl3 px-2>
+          <v-col
+            v-if="item.type"
+            :key="item.fld"
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+            px-2
+          >
             <div v-if="item.type === 'currency'">
               CURRENCY CONTROL HERE
             </div>
diff --git a/ayanova/src/components/tag-picker.vue b/ayanova/src/components/tag-picker.vue
index 563ee8c4..91e8ce1a 100644
--- a/ayanova/src/components/tag-picker.vue
+++ b/ayanova/src/components/tag-picker.vue
@@ -1,32 +1,37 @@
 <template>
-  <v-autocomplete
-    v-bind:value="value"
-    v-on:input="$emit('input', $event)"
-    :items="sourcetags"
-    :loading="tagSearchUnderway"
-    :search-input.sync="tagSearchEntry"
-    hide-selected
-    multiple
-    chips
-    clearable
-    deletable-chips
-    cache-items
-  >
-    <template slot="no-data" v-if="tagSearchEntry">
-      <v-container>
-        <v-row row>
-          <v-row justify-center>
-            <v-chip color="primary" text-color="white" class="display-1">
-              {{ this.normalizeTag(tagSearchEntry) }}</v-chip
-            >
-            <v-btn large icon @click="addTag()">
-              <v-icon large color="success">fa-plus-circle</v-icon>
-            </v-btn>
+  <div>
+    <span class="v-label v-label--active theme--light">
+      {{ lt("Tags") }}
+    </span>
+    <v-autocomplete
+      v-bind:value="value"
+      v-on:input="$emit('input', $event)"
+      :items="sourcetags"
+      :loading="tagSearchUnderway"
+      :search-input.sync="tagSearchEntry"
+      hide-selected
+      multiple
+      chips
+      clearable
+      deletable-chips
+      cache-items
+    >
+      <template slot="no-data" v-if="tagSearchEntry">
+        <v-container>
+          <v-row row>
+            <v-row justify-center>
+              <v-chip color="primary" text-color="white" class="display-1">
+                {{ this.normalizeTag(tagSearchEntry) }}</v-chip
+              >
+              <v-btn large icon @click="addTag()">
+                <v-icon large color="success">fa-plus-circle</v-icon>
+              </v-btn>
+            </v-row>
           </v-row>
-        </v-row>
-      </v-container>
-    </template>
-  </v-autocomplete>
+        </v-container>
+      </template>
+    </v-autocomplete>
+  </div>
 </template>
 <script>
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -85,6 +90,9 @@ export default {
   },
 
   methods: {
+    lt: function(ltkey) {
+      return window.$gz.locale.get(ltkey);
+    },
     addTag() {
       var theTag = this.tagSearchEntry;
       theTag = this.normalizeTag(theTag);
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index 88608217..f6f060ef 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -152,7 +152,6 @@
 
             <v-col cols="12">
               <gz-tag-picker
-                :label="lt('Tags')"
                 v-model="obj.tags"
                 :readonly="this.formState.readOnly"
                 ref="tags"