diff --git a/Only-War-Enhanced/OnlyWarEnhanced.css b/Only-War-Enhanced/OnlyWarEnhanced.css
index ba1a6f8374..d7907f1658 100644
--- a/Only-War-Enhanced/OnlyWarEnhanced.css
+++ b/Only-War-Enhanced/OnlyWarEnhanced.css
@@ -700,64 +700,67 @@ ______________________________ start of equipment tab __________________________
 	'rw36 rw37 rw37 rw38 rw38 rw39 rw39 rw39 rw40 rw41';
 }
 
+.sheet-equipment_melee_weapons_gs1 { grid-area: mw1; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs2 { grid-area: mw2; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs3 { grid-area: mw3; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs4 { grid-area: mw4; color: white; font-size: 12px; width: 50px!important;}
+.sheet-equipment_melee_weapons_gs5 { grid-area: mw5; color: white; font-size: 12px; width: 50px!important;}
 
-.sheet-equipment_melee_weapons_gs1 { grid-area: mw1;	color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs2 { grid-area: mw2;	color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs3 { grid-area: mw3;	color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs4 { grid-area: mw4;	color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs6 { grid-area: mw6; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs7 { grid-area: mw7; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs8 { grid-area: mw8; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs9 { grid-area: mw9; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
-.sheet-equipment_melee_weapons_gs5 { grid-area: mw5;	color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs6 { grid-area: mw6;	color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs7 { grid-area: mw7;	color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs8 { grid-area: mw8;	color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs9 { grid-area: mw9;	color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs10 { grid-area: mw10; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs11 { grid-area: mw11; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs12 { grid-area: mw12; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-
-.sheet-equipment_melee_weapons_gs13 { grid-area: mw13; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs10 { grid-area: mw10; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs11 { grid-area: mw11; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs12 { grid-area: mw12; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs13 { grid-area: mw13; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 .sheet-equipment_melee_weapons_gs14 { grid-area: mw14; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs15 { grid-area: mw15; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs16 { grid-area: mw16; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs17 { grid-area: mw17; color: white; font-size: 12px; padding: 0px 2px; }
-.sheet-equipment_melee_weapons_gs18 { grid-area: mw18; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
-.sheet-equipment_melee_weapons_gs19 { grid-area: mw19; color: white; font-size: 12px; width: 50px!important; }
-.sheet-equipment_melee_weapons_gs20 { grid-area: mw20; color: white; font-size: 12px; width: 50px!important; }
+.sheet-equipment_melee_weapons_gs15 { grid-area: mw15; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs16 { grid-area: mw16; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs17 { grid-area: mw17; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+
+.sheet-equipment_melee_weapons_gs18 { grid-area: mw18; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs19 { grid-area: mw19; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs20 { grid-area: mw20; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs21 { grid-area: mw21; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
+.sheet-equipment_melee_weapons_gs22 { grid-area: mw22; color: white; font-size: 12px; padding: 0px 2px; }
+.sheet-equipment_melee_weapons_gs23 { grid-area: mw23; color: white; font-size: 12px; border: none; border-bottom: 1px dotted white; }
 
 /* gs1-5 (5) Range/Attack/Aim Dropdowns, Hit/Dmg Buttons*/
 .sheet-equipment_melee_weapons_grid1 {
 	align-items: center;
 	display: grid;
-	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
+	grid-template-columns: auto auto auto 61px 61px;
 	grid-template-areas:
-	'rw1 rw2 rw2 rw2 rw2 rw2 rw3 rw4 rw4 rw4';
+	'mw1 mw2 mw3 mw4 mw5';
 }
 
-/* gs1-4 (4) name, domain */
-.sheet-equipment_melee_weapons_grid1 {
-	align-items: center;
-	display: grid;
-	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
-	grid-template-areas:
-	'mw1 mw2 mw2 mw2 mw2 mw2 mw2 mw3 mw4 mw4';
-}
-
-/* gs5-12 reach (8) damage, pen, type */
+/* gs6-9 (4) name, domain */
 .sheet-equipment_melee_weapons_grid2 {
 	align-items: center;
 	display: grid;
 	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
 	grid-template-areas:
-	'mw5 mw6 mw7 mw8 mw8 mw9 mw10 mw11 mw12 mw12';
+	'mw6 mw7 mw7 mw7 mw7 mw7 mw7 mw8 mw9 mw9';
 }
 
-/* gs13-18 (6) trained?, hitmod, weight */
+/* gs10-17 (8) reach, damage, pen, type */
 .sheet-equipment_melee_weapons_grid3 {
 	align-items: center;
 	display: grid;
-	grid-template-columns: auto 20px auto auto auto auto auto auto 61px 61px;
+	grid-template-columns: auto auto auto auto auto auto auto auto auto auto;
 	grid-template-areas:
-	'mw13 mw14 mw15 mw16 mw16 mw17 mw18 mw18 mw19 mw20';
+	'mw10 mw11 mw12 mw13 mw13 mw14 mw15 mw16 mw17 mw17';
+}
+
+/* gs18-23 (6) trained?, hitmod, weight */
+.sheet-equipment_melee_weapons_grid4 {
+	align-items: center;
+	display: grid;
+	grid-template-columns: auto 20px auto auto auto auto auto auto;
+	grid-template-areas:
+	'mw18 mw19 mw20 mw21 mw21 mw22 mw23 mw23';
 }