diff --git a/Shadowrun3e/shadowrun3e.css b/Shadowrun3e/shadowrun3e.css
index 1c7035fcf3..92247d2234 100644
--- a/Shadowrun3e/shadowrun3e.css
+++ b/Shadowrun3e/shadowrun3e.css
@@ -1833,6 +1833,12 @@ melee-table-row input[type="textarea"],
 	display: inline;
 	height: 80%;
 }
+.vranged-mods {
+    display: grid;
+    font-size: 10px;
+    text-align: center;
+    grid-template-columns: 80px 50px 50px 50px 70px 80px 80px 50px 80px 55px 140px;
+}
 .ranged-mods {
     display: grid;
     font-size: 10px;
diff --git a/Shadowrun3e/shadowrun3e.html b/Shadowrun3e/shadowrun3e.html
index b45196ec4d..be052340c9 100644
--- a/Shadowrun3e/shadowrun3e.html
+++ b/Shadowrun3e/shadowrun3e.html
@@ -2812,10 +2812,11 @@
                 <input type="number" name="attr_medium">
                 <input type="number" name="attr_long">
                 <input type="number" name="attr_extreme">
-                <div class="text-mid"><input type="radio" name="attr_firemode" value="ss" checked ></div>
-                <div class="text-mid"><input type="radio" name="attr_firemode" value="sa" /></div>
-                <div class="text-mid"><input type="radio" name="attr_firemode" value="bf" /></div>
-                <div class="text-mid"><input type="radio" name="attr_firemode" value="fa" /></div>
+                <input type="hidden" name="attr_firemode" value="sa">
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="ss"></div>
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="sa"></div>
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="bf"></div>
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="fa"></div>
                 <input type="number" name="attr_power" value=1>
                 <select name="attr_damage" title="Weapon Damage" class="mediumselect2">
                     <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
@@ -4229,10 +4230,11 @@
                 <input type="number" name="attr_medium">
                 <input type="number" name="attr_long">
                 <input type="number" name="attr_extreme">
-                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="ss" /></div>
-                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="sa" 1 /></div>
-                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="bf" /></div>
-                <div class="text-mid"><input type="checkbox" name="attr_firemode" value="fa" /></div>
+		<input type="hidden" name="attr_firemode" value="sa">
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="ss"></div>
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="sa"></div>
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="bf"></div>
+                <div class="text-mid"><input type="radio" name="attr_firemode" value="fa"></div>
                 <input type="number" name="attr_power" value=1>
                 <select name="attr_damage" class="mediumselect2">
                     <option data-i18n="light-damage-abbreviation" title="Light Damage" value="L" SELECTED>L</option>
@@ -4256,6 +4258,7 @@
                 </div>
                 <input type="hidden" class="show-weaponmods" name="attr_showmore" value="show">
                 <span class="show-weaponmods">
+                   <div class="vranged-mods">
                     <div class="text-mid" data-i18n="skill" class="text-mid"
                         title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
                         <b>Skill</div>
@@ -4276,8 +4279,6 @@
                         Reloads</div>
                     <div class="text-mid" data-i18n="ammo-type">Ammo Type</div>
                     <div class="text-mid" data-i18n="weight">Weight:</div>
-                    <div></div>
-                    <div></div>
                     <div class="text-mid" data-i18n="notes">Notes:</div>
                     <select name="attr_skill" class="mediumselect2"
                         title="choose weapon active skill, use Other if there is no match and put skill level in Specialized box">
@@ -4336,9 +4337,8 @@
                         <option data-i18n="stun-shell" value="stunshell">Stun Shell</option>
                     </select>
                     <div><input type="number" name="attr_weight" value=0 step='0.01'></div>
-                    <div class="text-mid"></div>
-                    <div class="text-mid"></div>
-                    <textarea name="attr_notes" style='width:80px;height:22px;'></textarea>
+                    <textarea name="attr_notes" style='width:190px;height:22px;'></textarea>
+		    </div>
                 </span>
             </div>
             <div class="table-bottom" />