diff --git a/module/item/item-sheet.js b/module/item/item-sheet.js
index bedf905..e4eaaae 100644
--- a/module/item/item-sheet.js
+++ b/module/item/item-sheet.js
@@ -10,7 +10,7 @@ export class DeltaGreenItemSheet extends ItemSheet {
       classes: ["deltagreen", "sheet", "item"],
       width: 520,
       height: 480,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "attributes" }]
     });
   }
 
diff --git a/templates/item/item-motivation-sheet.html b/templates/item/item-motivation-sheet.html
index 662bbf7..b340bbe 100644
--- a/templates/item/item-motivation-sheet.html
+++ b/templates/item/item-motivation-sheet.html
@@ -1,18 +1,25 @@
 <form class="{{cssClass}}" autocomplete="off">
     
-    <div class="motivation-section">
-        <label class="resource-label">Is Disorder: </label>
-        <input class="labeled-resource-checkbox" type="checkbox" name="data.crossedOut" {{checked data.crossedOut}} data-dtype="Boolean" 
-            title="Check this if the motivation has been lost after hitting a break point, or if entering a disorder."
-        />
-    </div>
+    
 
+    {{!-- Sheet Tab Navigation --}}
+    <nav class="sheet-tabs tabs" data-group="primary">
+        <a class="item item-toggle" data-tab="attributes">Attributes</a>
+        <a class="item" data-tab="description">Description/Notes</a>
+    </nav>
 
     {{!-- Sheet Body --}}
     <section class="sheet-body">
 
-        <div class=" attributes" data-group="primary" data-tab="attributes">
+        <div class="tab attributes" data-group="primary" data-tab="attributes">
             
+            <div class="motivation-section">
+                <label class="resource-label">Is Disorder: </label>
+                <input class="labeled-resource-checkbox" type="checkbox" name="data.crossedOut" {{checked data.crossedOut}} data-dtype="Boolean" 
+                    title="Check this if the motivation has been lost after hitting a break point, or if entering a disorder."
+                />
+            </div>
+
             <div class="resource">
                 <label class="resource-label">Motivation</label>
                 <input type="text" name="name" value="{{item.name}}" data-dtype="String"
@@ -45,17 +52,13 @@
             </div>
 
             {{/if}}
+            
+        </div>
 
-            <div class="motivation-section">
-                <label class="resource-label">Details</label>
-            </div>
-            
-              
-                
-            
-            
+        <div class="tab attributes" data-group="primary" data-tab="description">
+            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
         </div>
         
     </section>
-    {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+    
 </form>
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index 5da5be3..af94f64 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -49,7 +49,7 @@
     {{!-- Sheet Tab Navigation --}}
     <nav class="sheet-tabs tabs" data-group="primary">
         <a class="item" data-tab="description">Description</a>
-        <a class="item" data-tab="attributes">Attributes</a>
+        
     </nav>
 
     {{!-- Sheet Body --}}