diff --git a/app/imports/client/ui/properties/PropertyForm.vue b/app/imports/client/ui/properties/PropertyForm.vue
index 40301e3f..dcbaf437 100644
--- a/app/imports/client/ui/properties/PropertyForm.vue
+++ b/app/imports/client/ui/properties/PropertyForm.vue
@@ -30,7 +30,7 @@
     >
       <form-section
         v-if="context.isLibraryForm"
-        name="Library Options"
+        name="Library"
       >
         <v-row
           v-if="context.isLibraryForm"
diff --git a/app/imports/client/ui/properties/forms/BuffForm.vue b/app/imports/client/ui/properties/forms/BuffForm.vue
index 71d0f538..87b30123 100644
--- a/app/imports/client/ui/properties/forms/BuffForm.vue
+++ b/app/imports/client/ui/properties/forms/BuffForm.vue
@@ -1,12 +1,5 @@
 <template lang="html">
   <div class="buff-form">
-    <text-field
-      ref="focusFirst"
-      label="Name"
-      :value="model.name"
-      :error-messages="errors.name"
-      @change="change('name', ...arguments)"
-    />
     <inline-computation-field
       label="Description"
       :model="model.description"
@@ -44,7 +37,7 @@
       >
         <slot name="children" />
       </form-section>
-      <form-section name="Advanced">
+      <form-section name="Behavior">
         <v-row dense>
           <v-col
             cols="12"
@@ -58,18 +51,6 @@
               @change="change('hideRemoveButton', ...arguments)"
             />
           </v-col>
-          <v-col
-            cols="12"
-            sm="6"
-            md="4"
-          >
-            <smart-switch
-              label="Don't show in log"
-              :value="model.silent"
-              :error-messages="errors.silent"
-              @change="change('silent', ...arguments)"
-            />
-          </v-col>
           <v-col
             cols="12"
             sm="6"
@@ -83,14 +64,13 @@
             />
           </v-col>
         </v-row>
-        <smart-combobox
-          label="Tags"
-          multiple
-          chips
-          deletable-chips
-          hint="Used to let slots find this property in a library, should otherwise be left blank"
-          :value="model.tags"
-          @change="change('tags', ...arguments)"
+      </form-section>
+      <form-section name="Log">
+        <smart-switch
+          label="Don't show in log"
+          :value="model.silent"
+          :error-messages="errors.silent"
+          @change="change('silent', ...arguments)"
         />
       </form-section>
       <slot />