diff --git a/Tavern-Tales/TavernTalesSheet.html b/Tavern-Tales/TavernTalesSheet.html
index 65c232ae7b..06d8a07afc 100644
--- a/Tavern-Tales/TavernTalesSheet.html
+++ b/Tavern-Tales/TavernTalesSheet.html
@@ -1,6 +1,6 @@
 <div class="sheet-TavernTalesSheetBody">
 <div class="sheet-2colrow">
-
+ 
     <div class="sheet-col">
         <div class="sheet-Attributes">
             <h3>Attributes</h3>
@@ -70,54 +70,88 @@
             Soak: <input type="number" name="attr_soak" /></p>
         </div>
 
+        
+        <div class="sheet-equipment">
+
+			<div class="sheet-Weapons">
+
+				<h3>Weapons (name, keywords)</h3>
+				
+				<fieldset class="repeating_weapons">
+					<input type="text" class="sheet-TTitemName" name="attr_WeaponName" />
+					<input type="text" class="sheet-TTitemDesc" name="attr_weaponKeywords" />
+				</fieldset>
+				
+			</div>
+
+			<div class="sheet-Armor">
+				<h3>Armor (name, properties)</h3>
+				
+				<fieldset class="repeating_armor">
+					<input type="text" class="sheet-TTitemName" name="attr_ArmorName" />
+					<input type="text" class="sheet-TTitemDesc" name="attr_armorKeywords" />
+				</fieldset>
+				
+			</div>
+
+			<div class="sheet-MiscEquipment">
+				<h3>Other Equipment (name, description)</h3>
+				
+				<fieldset class="repeating_miscEquipment">
+					<input type="text" class="sheet-TTitemName" name="attr_EquipmentName" />
+					<input type="text" class="sheet-TTitemDesc" name="attr_equipmentDescription" />
+				</fieldset>
+				
+				
+			</div>
+
+			<div class="sheet-Gold">
+				<h3>Gold</h3>
+				<input type="number" name="attr_gold"/>
+			</div>
+
+		</div> <!-- Equipment -->
+		
+		
     </div> <!-- sheet-col -->
 
     <div class="sheet-col">
-        <img src="http://i.imgur.com/1ZKy6mc.jpg">
-        <h3>Buffs and Debuffs</h3>
-        <textarea name="attr_BuffsAndDebuffs" rows="5"></textarea>
-        
-    </div>
+	
+		<div class="sheet-logo">
+			<img src="http://i.imgur.com/1ZKy6mc.jpg">
+		</div>
+		
+		<div class="sheet-buffs">
+			<h3>Buffs and Debuffs</h3>
+			<textarea class="sheet-BuffEntryField" name="attr_BuffsAndDebuffs"></textarea>
+		</div>
+		
+		
+		<div class="sheet-traits">
+			<h3>Traits (Name, Description, Type)</h3>
+			<fieldset class="repeating_Traits">
+				<!-- <input type="text" class="sheet-TTtraitName" name="attr_TraitName" /> -->
+				<!-- <input type="text" class="sheet-TTtraitDesc" name="attr_TraitDescription" /> -->
+				<textarea class="sheet-TTtraitName" name="attr_TraitName" rows="2"></textarea>
+				<textarea class="sheet-TTtraitDesc" name="attr_TraitDescription" rows="2"></textarea>
+
+				<!--
+                <select class="sheet-TTTraitType" name="attr_TraitType" value="Combat">
+					<option value="Combat">C</option>
+					<option value="Exploration">E</option>
+					<option value="Interaction">I</option>
+				</select>
+                -->
+			</fieldset>
+				
+		
+		</div>
+		
+    </div> <!-- sheet-col -->
 </div> <!-- 2col-row -->
 
 
 
-<div class="sheet-row">
-    <h3>Weapons (name, keywords)</h3>
-    
-    <fieldset class="repeating_weapons">
-        <input type="text" name="attr_WeaponName" />
-        <input type="text" style="width:70%" name="attr_weaponKeywords" />
-    </fieldset>
-    </table>
-    
-</div>
 
-<div class="sheet-row">
-    <h3>Armor (name, properties)</h3>
-    
-    <fieldset class="repeating_armor">
-        <input type="text" name="attr_ArmorName" />
-        <input type="text" style="width:70%" name="attr_armorKeywords" />
-    </fieldset>
-    </table>
-    
-</div>
-
-<div class="sheet-row">
-    <h3>Other Equipment (name, description)</h3>
-    
-    <fieldset class="repeating_miscEquipment">
-        <input type="text" name="attr_EquipmentName" />
-        <input type="text" style="width:70%" name="attr_equipmentDescription" />
-    </fieldset>
-    </table>
-    
-</div>
-
-<div class="sheet-row">
-    <h3>Gold</h3>
-    <input type="number" name="attr_gold"/>
-</div>
 
 </div> <!-- sheet-TavernTalesSheetBody -->