diff --git a/StarWars5E/StarWars5E_CSS.css b/StarWars5E/StarWars5E_CSS.css
index 3fddbee646da..18aadde642d6 100644
--- a/StarWars5E/StarWars5E_CSS.css
+++ b/StarWars5E/StarWars5E_CSS.css
@@ -359,7 +359,7 @@
         height: 100%;
         width: 100%;
         border-radius: 50%;
-        background: url('https://raw.githubusercontent.com/BE-Arbiter/roll20-character-sheets/refs/heads/StarWars5E_npc/StarWars5E/pictures/alliance.png')
+        background: url('https://raw.githubusercontent.com/BE-Arbiter/roll20-character-sheets/refs/heads/StarWars5E/develop/StarWars5E/pictures/alliance.png')
                 center center no-repeat;
         background-size: 80% 80%;
         cursor: pointer;
@@ -2969,7 +2969,7 @@
 }
 /* Translation Overrides */
 /* Spanish */
-.ui-dialog .tab-content .charsheet.lang-es {
+.ui-dialog .tab-content .charsheet.lang-undefined {
     .break-lang {
         white-space: break-spaces;
     }
@@ -2991,6 +2991,15 @@
         flex-direction: column;
         gap: 0;
     }
+
+    .ship-cargo .hp .top input,
+    .ship-mods .hp .top input {
+        width: 110px;
+    }
+
+    .attacks .top .lang-long {
+        font-size: 7.5px;
+    }
 }
 
 
diff --git a/StarWars5E/StarWars5E_HTML.html b/StarWars5E/StarWars5E_HTML.html
index a6d19a2e3473..a3a04292a65e 100644
--- a/StarWars5E/StarWars5E_HTML.html
+++ b/StarWars5E/StarWars5E_HTML.html
@@ -4733,7 +4733,7 @@
                                     </div>
                                 </fieldset>
                                 <div class="weighttotal">
-                                    <span class="label" data-i18n="total-cargo-tons-u">TOTAL CARGO (TONS)</span>
+                                    <span class="label break-lang" data-i18n="total-cargo-tons-u">TOTAL CARGO (TONS)</span>
                                     <input type="text" name="attr_weighttotal" value="0">
                                 </div>
                             </div>
@@ -4790,7 +4790,7 @@
                                     </div>
                                 </fieldset>
                                 <div class="weighttotal">
-                                    <span class="label" data-i18n="total-hidden-cargo-tons-u">TOTAL HIDDEN CARGO (TONS)</span>
+                                    <span class="label break-lang" data-i18n="total-hidden-cargo-tons-u">TOTAL HIDDEN CARGO (TONS)</span>
                                     <input type="text" name="attr_hiddenweighttotal" value="0">
                                 </div>
                             </div>
@@ -4842,6 +4842,7 @@
                     </div>
                 </div>
             </div>
+            
     
         </div>
     
@@ -4983,7 +4984,7 @@
                                         <input type="number" name="attr_navcomputer_bonus">
                                     </div>
                                     <div class="label">
-                                        <span data-i18n="navcomputer_bonus-u">NAVCOMPUTER BONUS</span>
+                                        <span class="break-lang" data-i18n="navcomputer_bonus-u">NAVCOMPUTER BONUS</span>
                                     </div>
                                 </div>
                                 <div class="flex-row insp-prof-container">
@@ -5207,11 +5208,11 @@
                                 </div>
                                 <div class="speed">
                                     <input type="text" name="attr_ship_turnspeed">
-                                    <span class="label" data-i18n="ship_turnspeed-u">TURNING SPEED</span>
+                                    <span class="label break-lang" data-i18n="ship_turnspeed-u">TURNING SPEED</span>
                                 </div>
                                 <div class="speed">
                                     <input type="text" name="attr_ship_flyspeed">
-                                    <span class="label" data-i18n="ship_flyspeed-u">FLYING SPEED</span>
+                                    <span class="label break-lang" data-i18n="ship_flyspeed-u">FLYING SPEED</span>
                                 </div>
                             </div>
                             <div class="hp">
@@ -5291,7 +5292,7 @@
                                         <input type="checkbox" name="attr_deathsave_succ3">
                                     </div>
             
-                                    <button style="margin-top:8px;" type="roll" name="roll_death_save"
+                                    <button style="margin-top:8px;" class="break-lang" type="roll" name="roll_death_save"
                                             value="@{wtype}&{template:simple} {{rname=^{destruction-save-u}}} {{mod=@{death_save_bonus}}} {{r1=[[@{d20}+@{death_save_bonus}[MOD]@{globalsavingthrowbonus}]]}} {{normal=1}} {{global=@{global_save_mod}}} @{charname_output}"
                                             data-i18n="destruction-saves-u">DESTRUCTION SAVES
                                     </button>
@@ -5354,12 +5355,12 @@
                     <div class="attacks" style="position: relative;min-height:100px;min-width:500px">
                         <div class="top" style="margin-left:5px;">
                             <span class="label" style="width:50px;margin:0 10px 0 0;padding:0" data-i18n="ship-weapon-category-u">CATEGORY</span>
-                            <span class="label" style="width:50px;margin:0 9px 0 0;padding:0" data-i18n="ship-weapon-facing-u">FACING</span>
+                            <span class="label lang-long" style="width:50px;margin:0 9px 0 0;padding:0" data-i18n="ship-weapon-facing-u">FACING</span>
                             <span class="label" style="width:140px;margin:0 8px 0 0;padding:0" data-i18n="name-u">NAME</span>
                             <span class="label" style="width:50px;margin:0 9px 0 0;padding:0" data-i18n="ship-weapon-range-u">RANGE</span>
                             <span class="label" style="width:35px;margin:0 2px 0 0;padding:0" data-i18n="atk-u">ATK</span>
                             <span class="label" style="width:75px;margin:0 2px 0 0;padding:0" data-i18n="dmg-type-u">DAMAGE/TYPE</span>
-                            <span class="label" style="width:30px;margin:0;padding:0" data-i18n="attacks-per-round-u">ATKS</span>
+                            <span class="label lang-long" style="width:30px;margin:0;padding:0" data-i18n="attacks-per-round-u">ATKS</span>
                         </div>
                         <fieldset class="repeating_attack">
                             <div class="attack">