diff --git a/app/imports/client/ui/components/TreeDetailLayout.vue b/app/imports/client/ui/components/TreeDetailLayout.vue
index 0bba4362..2077e6a5 100644
--- a/app/imports/client/ui/components/TreeDetailLayout.vue
+++ b/app/imports/client/ui/components/TreeDetailLayout.vue
@@ -13,7 +13,7 @@
       <v-divider vertical />
       <div
         class="flex layout column"
-        style="background-color: inherit; overflow: hidden;"
+        style="background-color: inherit; overflow: hidden; min-height: 100%;"
         data-id="selected-node-card"
       >
         <slot name="detail" />
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
index 4d92e0b1..a133f0b9 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
@@ -46,6 +46,7 @@
             :_id="selectedNodeId"
             @removed="selectedNodeId = undefined"
             @duplicated="id => selectedNodeId = id"
+            @select-sub-property="clickNode"
           />
         </template>
       </tree-detail-layout>
diff --git a/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
index 228e47f2..54703e43 100644
--- a/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -4,11 +4,14 @@
     :class="{'no-icons': noIcons}"
   >
     <span
-      v-if="noLinks"
+      v-if="noLinks || embedded || collection !== 'creatureProperties'"
     >
-      <v-icon>
+      <v-icon v-if="collection === 'creatureProperties'">
         mdi-account
       </v-icon>
+      <v-icon v-else-if="collection === 'libraryNodes'">
+        mdi-book-open-blank-variant
+      </v-icon>
     </span>
     <a
       v-else
@@ -62,20 +65,29 @@
         type: Object,
         required: true,
       },
+      collection: {
+        type: String,
+        default: 'creatureProperties',
+      },
       noLinks: Boolean,
       noIcons: Boolean,
       editing: Boolean,
+      embedded: Boolean,
     },
     computed:{
       props(){
         return this.model.ancestors
           .slice(1)
           .map(ref => fetchDocByRef(ref))
-          .filter(prop => prop.type !== 'propertySlot');
+          .filter(prop => (this.collection !== 'creatureProperties' || prop.type !== 'propertySlot'));
       },
     },
     methods: {
-      click(id){
+      click(id) {
+        if (this.embedded) {
+          this.$emit('select-sub-property', id);
+          return;
+        }
         const store = this.$store;
         // Check if there is a dialog open for this doc already
         let dialogFound;
@@ -92,9 +104,12 @@
           // Pop dialogs until we get to it
           store.dispatch('popDialogStacks', dialogsToPop);
         } else {
+          const component = this.collection === 'creatureProperties' ? 'creature-property-dialog'
+            : this.collection === 'libraryNodes' ? 'library-node-dialog'
+            : undefined;
           // Otherwise open it as a new dialog
           store.commit('pushDialogStack', {
-            component: 'creature-property-dialog',
+            component,
             elementId: `breadcrumb-${id}`,
             data: {
               _id: id,
@@ -139,9 +154,6 @@
 .breadcrumbs {
   margin-bottom: 16px;
   opacity: 0.8;
-}
-.no-icons {
-
 }
 </style>
 
diff --git a/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index 606e270b..ce6e3c83 100644
--- a/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -16,12 +16,12 @@
       <div
         class="layout mb-4"
       >
-        <template v-if="!embedded">
-          <breadcrumbs
-            :model="model"
-            :editing="editing"
-          />
-        </template>
+        <breadcrumbs
+          :model="model"
+          :editing="editing"
+          :embedded="embedded"
+          @select-sub-property="selectSubProperty"
+        />
         <v-spacer />
         <v-chip disabled>
           {{ typeName }}
@@ -43,31 +43,12 @@
             @select-sub-property="selectSubProperty"
           />
         </div>
-        <div v-else>
-          <component
-            :is="model.type + 'Viewer'"
-            :key="_id"
-            class="creature-property-viewer"
-            :model="model"
-          />
-          <v-row
-            v-show="!embedded && childrenLength"
-            class="mt-1"
-            dense
-          >
-            <property-field
-              name="Child properties"
-              :cols="{cols: 12}"
-            >
-              <creature-properties-tree
-                style="width: 100%;"
-                :root="{collection: 'creatureProperties', id: model._id}"
-                @length="childrenLength = $event"
-                @selected="selectSubProperty"
-              />
-            </property-field>
-          </v-row>
-        </div>
+        <property-viewer 
+          v-else
+          :key="_id"
+          :model="model"
+          @select-sub-property="selectSubProperty"
+        />
       </v-fade-transition>
     </template>
     <div
@@ -100,11 +81,7 @@ import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
 import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
-import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
 import PropertyForm from '/imports/client/ui/properties/PropertyForm.vue';
-import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
-import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
 import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { get, findLast } from 'lodash';
@@ -114,29 +91,15 @@ import { getHighestOrder } from '/imports/api/parenting/order.js';
 import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
 import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
-
-let formIndex = {};
-for (let key in propertyFormIndex){
-  formIndex[key + 'Form'] = propertyFormIndex[key];
-}
-
-let viewerIndex = {};
-for (let key in propertyViewerIndex){
-  formIndex[key + 'Viewer'] = propertyViewerIndex[key];
-}
+import PropertyViewer from '/imports/client/ui/properties/shared/PropertyViewer.vue';
 
 export default {
   components: {
-    ...formIndex,
-    ...viewerIndex,
     PropertyForm,
-    PropertyIcon,
     DialogBase,
     PropertyToolbar,
-    CreaturePropertiesTree,
     Breadcrumbs,
-    PropertyField,
+    PropertyViewer,
   },
   props: {
     _id: String,
@@ -148,7 +111,6 @@ export default {
     // CurrentId lags behind Id by one tick so that events fired by destroying
     // forms keyed to the old ID are applied before the new ID overwrites it
     currentId: undefined,
-    childrenLength: 0,
   }},
   meteor: {
     model(){
diff --git a/app/imports/client/ui/library/LibraryAndNode.vue b/app/imports/client/ui/library/LibraryAndNode.vue
index 32620876..67623f7c 100644
--- a/app/imports/client/ui/library/LibraryAndNode.vue
+++ b/app/imports/client/ui/library/LibraryAndNode.vue
@@ -67,7 +67,7 @@
     <div
       slot="detail"
       data-id="selected-node-card"
-      style="overflow: hidden;"
+      style="overflow: hidden; min-height: 100%;"
     >
       <library-node-dialog
         :_id="selectedNodeId"
diff --git a/app/imports/client/ui/library/LibraryNodeDialog.vue b/app/imports/client/ui/library/LibraryNodeDialog.vue
index 85451db3..669e69a6 100644
--- a/app/imports/client/ui/library/LibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/LibraryNodeDialog.vue
@@ -14,6 +14,24 @@
         @color-changed="value => change({path: ['color'], value})"
       />
     </template>
+    <v-fade-transition>
+      <div
+        v-if="model"
+        class="layout mb-4"
+      >
+        <breadcrumbs
+          :model="model"
+          :editing="editing"
+          :embedded="embedded"
+          collection="libraryNodes"
+          @select-sub-property="selectSubProperty"
+        />
+        <v-spacer />
+        <v-chip disabled>
+          {{ typeName }}
+        </v-chip>
+      </div>
+    </v-fade-transition>
     <v-fade-transition
       mode="out-in"
     >
@@ -41,16 +59,13 @@
         @add-child="addLibraryNode"
         @select-sub-property="selectSubProperty"
       />
-      <component
-        :is="model.type + 'Viewer'"
-        v-else-if="model && !editing && $options.components[model.type + 'Viewer']"
+      <property-viewer 
+        v-else-if="model"
         :key="_id"
-        class="creature-property-viewer"
         :model="model"
+        collection="libraryNodes"
+        @select-sub-property="selectSubProperty"
       />
-      <p v-else>
-        This property can't be viewed yet.
-      </p>
     </v-fade-transition>
     <div
       v-if="!embedded"
@@ -96,9 +111,6 @@ import duplicateLibraryNode from '/imports/api/library/methods/duplicateLibraryN
 import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
-import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
-import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
 import { get } from 'lodash';
 import {
   assertDocEditPermission, assertDocCopyPermission
@@ -110,18 +122,16 @@ import copyLibraryNodeTo from '/imports/api/library/methods/copyLibraryNodeTo.js
 import { getHighestOrder } from '/imports/api/parenting/order.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import PropertyForm from '/imports/client/ui/properties/PropertyForm.vue';
-let viewerIndex = {};
-for (let key in propertyViewerIndex){
-  viewerIndex[key + 'Viewer'] = propertyViewerIndex[key];
-}
+import PropertyViewer from '/imports/client/ui/properties/shared/PropertyViewer.vue';
+import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
 
 export default {
   components: {
     PropertyToolbar,
-    PropertyIcon,
+    Breadcrumbs,
     DialogBase,
     PropertyForm,
-    ...viewerIndex,
+    PropertyViewer,
   },
   props: {
     _id: String,
@@ -140,6 +150,12 @@ export default {
     currentId: undefined,
     isLibraryForm: true,
   }},
+  computed: {
+    typeName(){
+      if (!this.model) return;
+      return getPropertyName(this.model.type)
+    },
+  },
   watch: {
     _id: {
       immediate: true,
@@ -205,7 +221,7 @@ export default {
       });
     },
     move(){
-      let that = this;
+      const id = this._id;
       this.$store.commit('pushDialogStack', {
         component: 'move-library-node-dialog',
         elementId: 'property-toolbar-menu-button',
@@ -214,7 +230,7 @@ export default {
           organizeDoc.call({
             docRef: {
               collection: 'libraryNodes',
-              id: that._id,
+              id,
             },
             parentRef: {
               collection: 'libraryNodes',
diff --git a/app/imports/client/ui/properties/PropertyForm.vue b/app/imports/client/ui/properties/PropertyForm.vue
index f108e593..003a1fbc 100644
--- a/app/imports/client/ui/properties/PropertyForm.vue
+++ b/app/imports/client/ui/properties/PropertyForm.vue
@@ -65,7 +65,7 @@
             md="6"
           >
             <smart-select
-              label="Slot Fill Type"
+              label="Slot fill type"
               style="flex-basis: 300px;"
               clearable
               hint="The property type that this slot filler pretends to be when being searched for by a slot"
@@ -80,7 +80,7 @@
             md="6"
           >
             <text-field
-              label="Slot Fill Quantity"
+              label="Slot quantity filled"
               type="number"
               min="0"
               hint="How many properties this counts as when filling a slot"
diff --git a/app/imports/client/ui/properties/shared/PropertyViewer.vue b/app/imports/client/ui/properties/shared/PropertyViewer.vue
index 20a3aeed..afce132e 100644
--- a/app/imports/client/ui/properties/shared/PropertyViewer.vue
+++ b/app/imports/client/ui/properties/shared/PropertyViewer.vue
@@ -1,11 +1,104 @@
 <template lang="html">
-  <component
-    :is="model.type"
+  <div
     v-if="model && $options.components[model.type]"
-    :key="model._id"
     class="property-viewer"
-    :model="model"
-  />
+  >
+    <component
+      :is="model.type"
+      :key="model._id"
+      class="property-viewer"
+      :model="model"
+    />
+    <v-row dense>
+      <template
+        v-if="collection == 'libraryNodes'"
+      >
+        <property-field
+          v-if="model.fillSlots || model.searchable"
+          name="Library Behavior"
+        >
+          <ul>
+            <li
+              v-if="model.fillSlots"
+            >
+              Can fill slots
+            </li>
+            <li v-if="model.searchable">
+              Searchable from character sheet
+            </li>
+          </ul>
+        </property-field>
+        <property-field 
+          name="Slot fill type"
+          :value="slotFillTypeName"
+        />
+        <property-field 
+          name="Slot quantity filled"
+          :value="model.slotQuantityFilled"
+        />
+        <property-field 
+          name="Condition"
+          mono
+          :value="model.slotFillerCondition"
+        />
+        <property-field 
+          name="Condition Error Text"
+          :value="model.slotFillerConditionNote"
+        />
+        <property-field 
+          name="Library Tags"
+          :cols="{cols: 12}"
+        >
+          <div
+            v-if="model.libraryTags && model.libraryTags.length"
+            class="py-2"
+          >
+            <v-chip
+              v-for="(tag, index) in model.libraryTags"
+              :key="tag + index"
+              class="mr-1"
+              small
+              disabled
+            >
+              {{ tag }}
+            </v-chip>
+          </div>
+        </property-field>
+      </template>
+      <property-field 
+        name="Tags"
+        :cols="{cols: 12}"
+      >
+        <div
+          v-if="model.tags && model.tags.length"
+          class="py-1"
+        >
+          <v-chip
+            v-for="(tag, index) in model.tags"
+            :key="tag + index"
+            class="mr-1"
+            disabled
+            small
+          >
+            {{ tag }}
+          </v-chip>
+        </div>
+      </property-field>
+      <property-field
+        v-show="childrenLength"
+        name="Child properties"
+        :cols="{cols: 12}"
+      >
+        <creature-properties-tree
+          style="width: 100%;"
+          :root="{collection, id: model._id}"
+          :collection="collection"
+          @length="childrenLength = $event"
+          @selected="selectSubProperty"
+        />
+      </property-field>
+    </v-row>
+  </div>
   <div v-else-if="model">
     This property can't be viewed yet.
   </div>
@@ -13,15 +106,40 @@
 
 <script lang="js">
 import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+
 export default {
   components: {
     ...propertyViewerIndex,
+    CreaturePropertiesTree,
+    PropertyField,
   },
   props: {
     model: {
       type: Object,
       default: undefined
     },
+    collection: {
+      type: String,
+      default: 'creatureProperties'
+    },
+  },
+  data() {
+    return {
+      childrenLength: 0,
+    }
+  },
+  computed: {
+    slotFillTypeName() {
+      return getPropertyName(this.model.slotFillerType);      
+    },
+  },
+  methods: {
+    selectSubProperty(_id) {
+      this.$emit('select-sub-property', _id);
+    },
   },
 }
 </script>
diff --git a/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue b/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
index fc53aec7..2e24617e 100644
--- a/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
@@ -1,32 +1,6 @@
 <template lang="html">
   <div class="slot-filler-viewer">
     <v-row dense>
-      <property-field
-        name="Type"
-        :value="slotTypeName"
-      />
-      <property-field
-        name="Quantity filled"
-        :value="model.slotQuantityFilled"
-      />
-      <property-field
-        v-if="!context.creatureId"
-        name="Condition"
-        mono
-        :value="model.slotFillerCondition"
-      />
-      <property-field
-        v-if="model.picture"
-        name="Image"
-        :cols="{cols: 12}"
-      >
-        <v-img
-          :src="model.picture"
-          :height="200"
-          contain
-          class="slot-card-image"
-        />
-      </property-field>
       <property-field
         v-if="model.description"
         name="Description"
diff --git a/app/imports/constants/PROPERTIES.js b/app/imports/constants/PROPERTIES.js
index c5484834..5a15ab5c 100644
--- a/app/imports/constants/PROPERTIES.js
+++ b/app/imports/constants/PROPERTIES.js
@@ -214,7 +214,7 @@ const PROPERTIES = Object.freeze({
 export default PROPERTIES;
 
 export function getPropertyName(type) {
-  return type && PROPERTIES[type] && PROPERTIES[type].name;
+  return (type && PROPERTIES[type] && PROPERTIES[type].name) || type;
 }
 
 export function getPropertyIcon(type) {