diff --git a/css/deltagreen.css b/css/deltagreen.css
index 7e49fce..aef64b2 100644
--- a/css/deltagreen.css
+++ b/css/deltagreen.css
@@ -718,4 +718,52 @@ div.motivation-editor-container div.editor{
   column-gap: 10px;
   row-gap: 10px;
   padding-right: 5px;
+}
+
+/*
+  Weapon Item Sheet
+*/
+
+.weapon-sheet-header-grid-3col{
+  display: grid;
+  grid-template-columns: 25% 15% 60%;
+  align-items: center;
+  justify-content: left;
+  text-align: left;
+  padding-left: 5px;
+  grid-gap: 5px;
+  padding-right: 10px;
+}
+
+.weapon-sheet-outer-grid-2col{
+  display: grid;
+  grid-template-columns: 60% 40% ;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  padding-left: 5px;
+  padding-right: 5px;
+  grid-gap: 5px;
+}
+
+.weapon-sheet-horizontal-grid-left-2col{
+  display: grid;
+  grid-template-columns: 40% 60%;
+  align-items: center;
+  text-align: left;
+  padding-bottom: 10px;
+  column-gap: 10px;
+  row-gap: 10px;
+  padding-right: 10px;
+}
+
+.weapon-sheet-horizontal-grid-right-2col{
+  display: grid;
+  grid-template-columns: 60% 40%;
+  align-items: center;
+  text-align: left;
+  padding-bottom: 10px;
+  column-gap: 10px;
+  row-gap: 10px;
+  padding-right: 10px;
 }
\ No newline at end of file
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index d2c5c72..9cf60f4 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -1,76 +1,81 @@
 <form class="{{cssClass}} {{getFontFamilySystemSettingClass}}" autocomplete="off">
-    <header class="sheet-header">
+    <header class="">
+      <div class="weapon-sheet-header-grid-3col">
+
         <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Weapons.NamePlaceholder'}}"/></h1>
-            <div class="weapon-grid-2col">
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.Skill'}}</label>
-                <select name="data.skill" >
-                    <option {{#if_eq data.data.skill 'firearms'}}selected{{/if_eq}} value="firearms">{{localize 'DG.Skills.firearms'}}</option>
-                    <option {{#if_eq data.data.skill 'melee_weapons'}}selected{{/if_eq}} value="melee_weapons">{{localize 'DG.Skills.melee_weapons'}}</option>
-                    <option {{#if_eq data.data.skill 'unarmed_combat'}}selected{{/if_eq}} value="unarmed_combat">{{localize 'DG.Skills.unarmed_combat'}}</option>
-                    <option {{#if_eq data.data.skill 'heavy_weapons'}}selected{{/if_eq}} value="heavy_weapons">{{localize 'DG.Skills.heavy_weapons'}}</option>
-                    <option {{#if_eq data.data.skill 'athletics'}}selected{{/if_eq}} value="athletics">{{localize 'DG.Skills.athletics'}}</option>
-                    <option {{#if_eq data.data.skill 'demolitions'}}selected{{/if_eq}} value="demolitions">{{localize 'DG.Skills.demolitions'}}</option>
-                    <option {{#if_eq data.data.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
-                </select>
-              </div>
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.Expense'}}</label>
-                <select name="data.expense" >
-                  <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
-                  <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
-                  <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
-                  <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
-                  <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
-                </select>
-              </div>
 
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.IsLethality'}}: </label>
-                <input class="labeled-resource-checkbox" type="checkbox" name="data.isLethal" {{checked data.data.isLethal}} data-dtype="Boolean" 
-                    title="{{localize 'DG.ItemWindow.Weapons.IsLethalityTooltip'}}"
-                />
-              </div>
+        <span class="resource-label">{{localize 'DG.Bonds.Name'}}:</span>
+        <input name="name" type="text" value="{{item.name}}" placeholder="{{localize 'DG.ItemWindow.Weapons.NamePlaceholder'}}"/>
+      </div>
+      
+      <div class="weapon-sheet-outer-grid-2col">
 
-              {{#unless data.data.isLethal}}
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.Damage'}}</label>
-                <input type="text" name="data.damage" value="{{data.data.damage}}" data-dtype="String"/>
-              </div>
-              {{/unless}}
+        <div class="weapon-sheet-horizontal-grid-left-2col">
 
-              {{#if data.data.isLethal}}
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.Lethality'}} %</label>
-                <input class="" type="text" name="data.lethality" value="{{data.data.lethality}}" data-dtype="Number"
-                  title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
-                />
-              </div>
-              {{/if}}
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Skill'}}:</span>
+          <select name="data.skill" >
+              <option {{#if_eq data.data.skill 'firearms'}}selected{{/if_eq}} value="firearms">{{localize 'DG.Skills.firearms'}}</option>
+              <option {{#if_eq data.data.skill 'melee_weapons'}}selected{{/if_eq}} value="melee_weapons">{{localize 'DG.Skills.melee_weapons'}}</option>
+              <option {{#if_eq data.data.skill 'unarmed_combat'}}selected{{/if_eq}} value="unarmed_combat">{{localize 'DG.Skills.unarmed_combat'}}</option>
+              <option {{#if_eq data.data.skill 'heavy_weapons'}}selected{{/if_eq}} value="heavy_weapons">{{localize 'DG.Skills.heavy_weapons'}}</option>
+              <option {{#if_eq data.data.skill 'athletics'}}selected{{/if_eq}} value="athletics">{{localize 'DG.Skills.athletics'}}</option>
+              <option {{#if_eq data.data.skill 'demolitions'}}selected{{/if_eq}} value="demolitions">{{localize 'DG.Skills.demolitions'}}</option>
+              <option {{#if_eq data.data.skill 'artillery'}}selected{{/if_eq}} value="artillery">{{localize 'DG.Skills.artillery'}}</option>
+          </select>                    
 
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.ArmorPiercing'}}</label>
-                <input type="text" name="data.armorPiercing" value="{{data.data.armorPiercing}}" data-dtype="Number"/>
-              </div>
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Expense'}}:</span>
+          <select name="data.expense" >
+            <option {{#if_eq data.data.expense 'Incidental'}}selected{{/if_eq}} value="Incidental">{{localize 'DG.Gear.Expense.Incidental'}}</option>
+            <option {{#if_eq data.data.expense 'Standard'}}selected{{/if_eq}} value="Standard">{{localize 'DG.Gear.Expense.Standard'}}</option>
+            <option {{#if_eq data.data.expense 'Unusual'}}selected{{/if_eq}} value="Unusual">{{localize 'DG.Gear.Expense.Unusual'}}</option>
+            <option {{#if_eq data.data.expense 'Major'}}selected{{/if_eq}} value="Major">{{localize 'DG.Gear.Expense.Major'}}</option>
+            <option {{#if_eq data.data.expense 'Extreme'}}selected{{/if_eq}} value="Extreme">{{localize 'DG.Gear.Expense.Extreme'}}</option>
+          </select>
 
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.Ammo'}}</label>
-                <input type="text" name="data.ammo" value="{{data.data.ammo}}" data-dtype="String"/>
-              </div>
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.IsLethality'}}: </span>
+          <input class="labeled-resource-checkbox" type="checkbox" name="data.isLethal" {{checked data.data.isLethal}} data-dtype="Boolean" 
+              title="{{localize 'DG.ItemWindow.Weapons.IsLethalityTooltip'}}"
+          />
 
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.Range'}}</label>
-                <input type="text" name="data.range" value="{{data.data.range}}" data-dtype="String"/>
-              </div>
-
-              <div class="resource">
-                <label class="resource-label">{{localize 'DG.ItemWindow.Weapons.KillRadius'}}</label>
-                <input type="text" name="data.killRadius" value="{{data.data.killRadius}}" data-dtype="String"/>
-              </div>
-            </div>
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Ammo'}}:</span>
+          <input type="text" name="data.ammo" value="{{data.data.ammo}}" data-dtype="String"/>
+          
         </div>
+
+        <div class="weapon-sheet-horizontal-grid-right-2col">
+        
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Range'}}:</span>
+          <input type="text" name="data.range" value="{{data.data.range}}" data-dtype="String"/>
+
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.ArmorPiercing'}}:</span>
+          <input type="text" name="data.armorPiercing" value="{{data.data.armorPiercing}}" data-dtype="Number"/>
+          
+          {{!-- If a weapon is 'Lethal', need to show the d100% Lethality input, otherwise only show the regular Damage formula (e.g. 1D6, 1D4+2, etc...) --}}
+
+          {{#unless data.data.isLethal}}
+          
+            <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Damage'}}:</span>
+            <input type="text" name="data.damage" value="{{data.data.damage}}" data-dtype="String"/>
+          
+          {{/unless}}
+
+          {{#if data.data.isLethal}}
+          
+            <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.Lethality'}}:</span>
+            <input class="" type="text" name="data.lethality" value="{{data.data.lethality}}" data-dtype="Number"
+              title="{{localize 'DG.ItemWindow.Weapons.LethalityTooltip'}}"
+            />
+          
+          {{/if}}
+          
+          <span class="resource-label">{{localize 'DG.ItemWindow.Weapons.KillRadius'}}:</span>
+          <input type="text" name="data.killRadius" value="{{data.data.killRadius}}" data-dtype="String"/>
+ 
+        </div>
+
+      </div>
+
+              
     </header>
 
     {{!-- Sheet Tab Navigation --}}