diff --git a/module/actor/ship-sheet-sbt.js b/module/actor/ship-sheet-sbt.js
index 92b7b67..452f8bb 100644
--- a/module/actor/ship-sheet-sbt.js
+++ b/module/actor/ship-sheet-sbt.js
@@ -144,6 +144,8 @@ export class MothershipShipSheetSBT extends ActorSheet {
             } else if (i.type === 'module') {
                 modules.push(i);
             } else if (i.type == 'repair'){
+                i.name = i.name.split('.')[0];
+
                 if(i.system.major){
                     majorRepairs.push(i);
                 }
diff --git a/templates/actor/ship-sheet-sbt.html b/templates/actor/ship-sheet-sbt.html
index 5d1dfdf..448de14 100644
--- a/templates/actor/ship-sheet-sbt.html
+++ b/templates/actor/ship-sheet-sbt.html
@@ -420,7 +420,7 @@
                     <div class="item-image"><img src="{{weapon.img}}" title="{{weapon.name}}" width="24" height="24" />
                     </div>
                     <div class="skill-name weapon-roll list-roll" style="flex-grow: 2;">{{weapon.name}}</div>
-                    <div class="skill-stat">{{weapon.system.damage}}</div>
+                    <div class="skill-stat">{{weapon.system.bonus}}</div>
                     <div class="item-controls">
                         <a class="item-control weapon-edit" title="Edit Weapon"><i class="fas fa-edit"></i></a>
                         <a class="item-control item-delete" title="Delete Weapon"><i class="fas fa-trash"></i></a>
diff --git a/templates/item/item-weapon-sheet.html b/templates/item/item-weapon-sheet.html
index 5e7dac4..6c7227e 100644
--- a/templates/item/item-weapon-sheet.html
+++ b/templates/item/item-weapon-sheet.html
@@ -160,7 +160,8 @@
     {{!-- Sheet Tab Navigation --}}
     <nav class="mosh sheet-tabs tabs" style="height: auto;" data-group="primary">
       <a class="tab-select" data-tab="description">Description</a>
-      <a class="tab-select" data-tab="item">Item</a>
+      <a class="tab-select" data-tab="item">Other</a>
+
     </nav>
   
     <br/>
@@ -176,15 +177,46 @@
       {{!-- Item Tab --}}
       <div class="tab ranges" data-group="primary" data-tab="item">
         <div class="grid grid-3col">
-          <div class="resource">
+
+        <div class="resource healthspread minmaxtopstat flex-center" style="grid-template-rows: max-content;">
+            <label for="system.cost" class="resource-label minmaxtext">Value</label>
+
+            <div class="valuewrapper" style="width: 120px; background: white;">
+                <input class="maxhealth-input darkGreyText" type="text" name="system.cost" value="{{system.cost}}"
+                    data-dtype="Number" />
+            </div>
+        </div>
+
+          <!-- <div class="resource">
             <label class="resource-label">Value</label>
             <input type="text" name="system.cost" value="{{system.cost}}" data-dtype="Number" />
-          </div>
-          <div class="resource">
+          </div> -->
+
+          <div class="resource healthspread minmaxtopstat flex-center" style="grid-template-rows: max-content;">
+            <label for="system.weight" class="resource-label minmaxtext">Weight</label>
+
+            <div class="valuewrapper" style="width: 120px; background: white;">
+                <input class="maxhealth-input darkGreyText" type="text" name="system.weight" value="{{system.weight}}"
+                    data-dtype="Number" />
+            </div>
+        </div>
+
+        <!-- Bonus -->
+        <div class="resource healthspread minmaxtopstat flex-center" style="grid-template-rows: max-content;">
+            <label for="system.bonus" class="resource-label minmaxtext">Ship Weapon Bonus</label>
+
+            <div class="valuewrapper" style="width: 120px; background: white;">
+                <input class="maxhealth-input darkGreyText" type="text" name="system.bonus" value="{{system.bonus}}"
+                    data-dtype="Number" />
+            </div>
+        </div>
+
+          <!-- <div class="resource">
             <label class="resource-label">Weight</label>
             <input type="text" name="system.weight" value="{{system.weight}}" data-dtype="Number" />
-          </div>
+          </div> -->
         </div>
       </div>
+
     </section>
 </form>
\ No newline at end of file