diff --git a/src/module/entities/TwodsixItem.ts b/src/module/entities/TwodsixItem.ts
index 65a938c87..89aa789bd 100644
--- a/src/module/entities/TwodsixItem.ts
+++ b/src/module/entities/TwodsixItem.ts
@@ -194,7 +194,7 @@ export default class TwodsixItem extends Item {
       if (targetTokens.length === 1) {
         const targetRange = canvas.grid.measureDistance(controlledTokens[0], targetTokens[0], {gridSpaces: true});
         rangeModifier = this.getRangeModifier(targetRange);
-        rangeLabel = isCEBands ? (this.system.rangeBand === 'none' ? game.i18n.localize(localizePrefix + "none") : `${game.i18n.localize(localizePrefix + getRangeBand(targetRange))}`) : `${targetRange} ${canvas.scene.grid.units}`;
+        rangeLabel = isCEBands ? (this.system.rangeBand === 'none' ? game.i18n.localize(localizePrefix + "none") : `${game.i18n.localize(localizePrefix + getRangeBand(targetRange))}`) : `${targetRange.toLocaleString(game.i18n.lang, {maximumFractionDigits: 2})} ${canvas.scene.grid.units}`;
       } else if (targetTokens.length === 0) {
         rangeLabel = isCEBands && this.system.rangeBand === 'none' ? game.i18n.localize(localizePrefix + "none") : game.i18n.localize("TWODSIX.Ship.Unknown");
       }
diff --git a/static/templates/items/parts/weapon-sheet-flat.html b/static/templates/items/parts/weapon-sheet-flat.html
index eb47891ba..a98ff64f3 100644
--- a/static/templates/items/parts/weapon-sheet-flat.html
+++ b/static/templates/items/parts/weapon-sheet-flat.html
@@ -5,6 +5,15 @@
     <label class="resource-label" for="system.handlingModifiers">{{localize "TWODSIX.Items.Weapon.HandlingModifiers"}}</label>
     <input class="form-input" id="system.handlingModifiers" type="text" placeholder="{{localize 'TWODSIX.Items.Weapon.HandlingExample'}}" name="system.handlingModifiers" value="{{system.handlingModifiers}}">
   </div>
+  <div class="item-range">
+    {{#if settings.ShowRangeBandAndHideRange}}
+      <label class="resource-label" for="system.rangeBand">{{localize "TWODSIX.Items.Weapon.rangeBand"}}</label>
+      <select id="system.rangeBand" name="system.rangeBand">{{selectOptions settings.rangeTypes selected=system.rangeBand localize=true}}</select>
+    {{else}}
+      <label class="resource-label" for="system.range">{{localize "TWODSIX.Items.Weapon.Range"}}</label>
+      <input class="form-input" id="system.range" type="text" name="system.range" value="{{system.range}}">
+    {{/if}}
+  </div>
   {{> "systems/twodsix/templates/items/parts/weapon-parts/weapon-attack.html"}}
   {{> "systems/twodsix/templates/items/parts/weapon-parts/weapon-magazine.html"}}