diff --git a/css/fvtt-hellborn.css b/css/fvtt-hellborn.css
index 58970bd..75a2fa6 100644
--- a/css/fvtt-hellborn.css
+++ b/css/fvtt-hellborn.css
@@ -547,20 +547,28 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .properties {
-  min-width: 21rem;
-  max-width: 21rem;
+  min-width: 18rem;
+  max-width: 18rem;
 }
-.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .type {
+.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .range {
   min-width: 4rem;
   max-width: 4rem;
 }
+.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .ammo {
+  min-width: 3rem;
+  max-width: 3rem;
+}
+.fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .type {
+  min-width: 3rem;
+  max-width: 3rem;
+}
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .damage {
-  min-width: 6rem;
-  max-width: 6rem;
+  min-width: 4rem;
+  max-width: 4rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .name {
-  min-width: 12rem;
-  max-width: 12rem;
+  min-width: 10rem;
+  max-width: 10rem;
 }
 .fvtt-hellborn .tab.character-equipment .main-div .weapons .weapon .item-img {
   width: 24px;
@@ -1353,20 +1361,28 @@ i.fvtt-hellborn {
   max-width: 1.8rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .properties {
-  min-width: 21rem;
-  max-width: 21rem;
+  min-width: 18rem;
+  max-width: 18rem;
 }
-.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .type {
+.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .range {
   min-width: 4rem;
   max-width: 4rem;
 }
+.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .ammo {
+  min-width: 3rem;
+  max-width: 3rem;
+}
+.fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .type {
+  min-width: 3rem;
+  max-width: 3rem;
+}
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .damage {
-  min-width: 6rem;
-  max-width: 6rem;
+  min-width: 4rem;
+  max-width: 4rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .name {
-  min-width: 12rem;
-  max-width: 12rem;
+  min-width: 10rem;
+  max-width: 10rem;
 }
 .fvtt-hellborn .tab.enemy-traits .main-div .weapons .weapon .item-img {
   width: 24px;
diff --git a/styles/character.less b/styles/character.less
index 62d153d..763d2b3 100644
--- a/styles/character.less
+++ b/styles/character.less
@@ -421,20 +421,28 @@
         max-width: 1.8rem;
       }
       .properties {
-        min-width: 21rem;
-        max-width: 21rem;
+        min-width: 18rem;
+        max-width: 18rem;
       }
-      .type {
+      .range {
         min-width: 4rem;
         max-width: 4rem;
       }
+      .ammo {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
+      .type {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
       .damage {
-        min-width: 6rem;
-        max-width: 6rem;
+        min-width: 4rem;
+        max-width: 4rem;
       }
       .name {
-        min-width: 12rem;
-        max-width: 12rem;
+        min-width: 10rem;
+        max-width: 10rem;
       }
       .item-img {
         width: 24px;
diff --git a/styles/enemy.less b/styles/enemy.less
index 1012050..45fac03 100644
--- a/styles/enemy.less
+++ b/styles/enemy.less
@@ -340,20 +340,28 @@
         max-width: 1.8rem;
       }
       .properties {
-        min-width: 21rem;
-        max-width: 21rem;
+        min-width: 18rem;
+        max-width: 18rem;
       }
-      .type {
+      .range {
         min-width: 4rem;
         max-width: 4rem;
       }
+      .ammo {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
+      .type {
+        min-width: 3rem;
+        max-width: 3rem;
+      }
       .damage {
-        min-width: 6rem;
-        max-width: 6rem;
+        min-width: 4rem;
+        max-width: 4rem;
       }
       .name {
-        min-width: 12rem;
-        max-width: 12rem;
+        min-width: 10rem;
+        max-width: 10rem;
       }
       .item-img {
         width: 24px;
diff --git a/templates/character-equipment.hbs b/templates/character-equipment.hbs
index 9027352..e378d08 100644
--- a/templates/character-equipment.hbs
+++ b/templates/character-equipment.hbs
@@ -17,6 +17,8 @@
           </div>
           <span class="type" data-tooltip="Type">{{upperFirst item.system.weaponType}}</span>
           <span class="properties" data-tooltip="Properties">{{upperFirst item.system.properties}}</span>
+          <span class="range" data-tooltip="Range">{{upperFirst item.system.range}}</span>
+          <span class="ammo" data-tooltip="Ammo">{{upperFirst item.system.ammo}}</span>
 
           <a class="damage rollable" data-tooltip="Damage" data-item-id="{{item.id}}" data-action="roll"
             data-roll-type="damage" data-roll-value="{{item.system.damage}}">
diff --git a/templates/enemy-trait.hbs b/templates/enemy-trait.hbs
index 5136d2d..09eed4c 100644
--- a/templates/enemy-trait.hbs
+++ b/templates/enemy-trait.hbs
@@ -107,6 +107,8 @@
           </div>
           <span class="type" data-tooltip="Type">{{upperFirst item.system.weaponType}}</span>
           <span class="properties" data-tooltip="Properties">{{upperFirst item.system.properties}}</span>
+          <span class="range" data-tooltip="Range">{{upperFirst item.system.range}}</span>
+          <span class="ammo" data-tooltip="Ammo">{{upperFirst item.system.ammo}}</span>
 
           <a class="damage rollable" data-tooltip="Damage" data-item-id="{{item.id}}" data-action="roll"
             data-roll-type="damage" data-roll-value="{{item.system.damage}}">