diff --git a/ADnD_2E_Revised/2EStyle.css b/ADnD_2E_Revised/2EStyle.css
index 1d012346a3..537e3bc738 100644
--- a/ADnD_2E_Revised/2EStyle.css
+++ b/ADnD_2E_Revised/2EStyle.css
@@ -916,11 +916,8 @@ input.sheet-toast-error:checked ~ .sheet-toast-content {
     }
 
     /* Add datalist arrow to Firefox */
-    input[list] + span {
-        text-align: start;
-    }
-    input[list]:hover + span:before,
-    input[list]:focus + span:before {
+    input[list] + span:before,
+    input[list] + span:before {
         content: "▼";
         color: #333;
         font-size: 10px;
@@ -928,6 +925,11 @@ input.sheet-toast-error:checked ~ .sheet-toast-content {
         padding-right: 8px;
         pointer-events:none;
         text-align: start;
+        visibility: collapse;
+    }
+    input[list]:hover + span:before,
+    input[list]:focus + span:before {
+        visibility: visible;
     }
     input[type="number"][list]:hover + span:before,
     input[type="number"][list]:focus + span:before {
diff --git a/ADnD_2E_Revised/css/browser-support.css b/ADnD_2E_Revised/css/browser-support.css
index 7598d11a43..a5f20d2c2c 100644
--- a/ADnD_2E_Revised/css/browser-support.css
+++ b/ADnD_2E_Revised/css/browser-support.css
@@ -14,11 +14,8 @@
     }
 
     /* Add datalist arrow to Firefox */
-    input[list] + span {
-        text-align: start;
-    }
-    input[list]:hover + span:before,
-    input[list]:focus + span:before {
+    input[list] + span:before,
+    input[list] + span:before {
         content: "▼";
         color: #333;
         font-size: 10px;
@@ -26,6 +23,11 @@
         padding-right: 8px;
         pointer-events:none;
         text-align: start;
+        visibility: collapse;
+    }
+    input[list]:hover + span:before,
+    input[list]:focus + span:before {
+        visibility: visible;
     }
     input[type="number"][list]:hover + span:before,
     input[type="number"][list]:focus + span:before {
diff --git a/ADnD_2E_Revised/html/shared/priest-spell-template.html b/ADnD_2E_Revised/html/shared/priest-spell-template.html
index 00c9b117a7..c91ad8d26c 100644
--- a/ADnD_2E_Revised/html/shared/priest-spell-template.html
+++ b/ADnD_2E_Revised/html/shared/priest-spell-template.html
@@ -12,7 +12,7 @@
       <tr>
         <td class="sheet-td-dynamic50">
           <input class="sheet-table-dynamic sheet-chrome" type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" placeholder="Spell name" list="#REPLACE0#-spells"/>
-          <input class="sheet-table-dynamic sheet-firefox" type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" placeholder="Spell name" list="#REPLACE0#-spells-ff"/>
+          <input class="sheet-table-dynamic sheet-firefox" type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" placeholder="Spell name" list="#REPLACE0#-spells-ff"/><span></span>
         </td>
         <td class="sheet-td-dynamic25">
           <input class="sheet-table-dynamic" type="text" name="attr_spell-range" title="@{repeating_spells-#REPLACE0#_$X_spell-range}" placeholder="Range"/>
diff --git a/ADnD_2E_Revised/html/shared/wizard-spell-template.html b/ADnD_2E_Revised/html/shared/wizard-spell-template.html
index 139e0b8797..1520a29d4a 100644
--- a/ADnD_2E_Revised/html/shared/wizard-spell-template.html
+++ b/ADnD_2E_Revised/html/shared/wizard-spell-template.html
@@ -12,7 +12,7 @@
       <tr>
         <td class="sheet-td-dynamic50">
           <input class="sheet-table-dynamic sheet-chrome" type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" placeholder="Spell name" list="#REPLACE0#-spells"/>
-          <input class="sheet-table-dynamic sheet-firefox" type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" placeholder="Spell name" list="#REPLACE0#-spells-ff"/>
+          <input class="sheet-table-dynamic sheet-firefox" type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" placeholder="Spell name" list="#REPLACE0#-spells-ff"/><span></span>
         </td>
         <td class="sheet-td-dynamic25">
           <input class="sheet-table-dynamic" type="text" name="attr_spell-range" title="@{repeating_spells-#REPLACE0#_$X_spell-range}" placeholder="Range"/>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
index 6a3b6fb07f..61774e07cf 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/followers-tab.html
@@ -1544,7 +1544,7 @@
             </div>
             <div class="sheet-tab-content sheet-section-psionics-advanced-hench">
                 <h4>Psionics Revised</h4>
-                <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
+                <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
                 <br>
                 <label>You can use + to denote different sources of bonuses.</label>
                 <br>
@@ -2726,7 +2726,7 @@
                 </div>
                 <div class="sheet-tab-content sheet-section-psionics-advanced-repeat">
                     <h4>Psionics Revised</h4>
-                    <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
+                    <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
                     <br>
                     <label>You can use + to denote different sources of bonuses.</label>
                     <br>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
index 77606992d3..80a9c148af 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/proficiencies-tab.html
@@ -15,7 +15,7 @@
                     </tr>
                     </thead>
                     <tr>
-                        <td><input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-half" list="weapprof-macros" placeholder="Macro or number"/></td>
+                        <td><input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-half" list="weapprof-macros" placeholder="Macro or number"/><span></span></td>
                         <td><input type="number" name="attr_weapprof-slots-total-calc" title="@{weapprof-slots-total-calc}" class="sheet-table-dynamic" value="0" readonly/></td>
                     </tr>
                 </table>
@@ -62,7 +62,7 @@
                         <tr>
                             <td class="sheet-td-dynamic100">
                                 <input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weapprofname}" class="sheet-middle-min sheet-chrome" placeholder="Name of Weapon Prof" list="weapon-proficiencies">
-                                <input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weapprofname}" class="sheet-middle-min sheet-firefox" placeholder="Name of Weapon Prof" list="weapon-proficiencies-ff">
+                                <input type="text" name="attr_weapprofname" title="@{repeating_weaponprofs_$X_weapprofname}" class="sheet-middle-min sheet-firefox" placeholder="Name of Weapon Prof" list="weapon-proficiencies-ff"><span></span>
                             </td>
                             <td><input type="number" name="attr_weapprofnum" title="@{repeating_weaponprofs_$X_weapprofnum}" class="sheet-short" placeholder="Slots"></td>
                             <td><label><input type="checkbox" name="attr_expert" title="@{repeating_weaponprofs_$X_expert}" value="1"/><span></span></label></td>
@@ -109,18 +109,18 @@
                     <tr>
                         <td class="sheet-td-dynamic50">
                             <input type="text" name="attr_talentname" title="@{repeating_talents_$X_talentname}" class="sheet-midishtext-min sheet-chrome" placeholder="Name of Talent" list="talents">
-                            <input type="text" name="attr_talentname" title="@{repeating_talents_$X_talentname}" class="sheet-midishtext-min sheet-firefox" placeholder="Name of Talent" list="talents-ff">
+                            <input type="text" name="attr_talentname" title="@{repeating_talents_$X_talentname}" class="sheet-midishtext-min sheet-firefox" placeholder="Name of Talent" list="talents-ff"><span></span>
                         </td>
                         <td><input type="number" name="attr_talentslots" title="@{repeating_talents_$X_talentslots}" class="sheet-smallish" value="0"></td>
                         <td><input type="text" name="attr_talentpoints" title="@{repeating_talents_$X_talentpoints}" class="sheet-tinish" value="0"></td>
-                        <td class="sheet-td-dynamic50"><input type="text" name="attr_talentstatnum" title="@{repeating_talents_$X_talentstatnum}"s class="sheet-attr-min" placeholder="@{abilityScore}" list="sub-ability-scores"></td>
+                        <td class="sheet-td-dynamic50"><input type="text" name="attr_talentstatnum" title="@{repeating_talents_$X_talentstatnum}"s class="sheet-attr-min" placeholder="@{abilityScore}" list="sub-ability-scores"><span></span></td>
                         <td>&plusmn;</td>
                         <td><input type="text" name="attr_talentmod" title="@{repeating_talents_$X_talentmod}" class="sheet-tinish" value="0"></td>
                         <td><button type="roll" name="roll_Talent" title="%{repeating_talents_$X_Talent}" value="/em tries to use their talent in @{talentname}, with a roll of [[1d20cs1cf20]]&le;[[(@{talentstatnum})+(@{talentmod})+(@{misc-mod})]]"></button></td>
                         <td><input type="text" name="attr_talentrating" title="@{repeating_talents_$X_talentrating}" class="sheet-tinish" value="0"></td>
                         <td>&plusmn;</td>
                         <td><input type="text" name="attr_talentratingmod" title="@{repeating_talents_$X_talentratingmod}" class="sheet-tinish" value="0"></td>
-                        <td><button type="roll" name="roll_Talentrating" title="%{repeating_talents_$X_Talentrating}" value="/em tries to use their talent in @{talentname}, with a roll of [[1d20cs1cf20]]&le;[[(@{talentrating})+(@{misc-mod})]]"></td>
+                        <td><button type="roll" name="roll_Talentrating" title="%{repeating_talents_$X_Talentrating}" value="/em tries to use their talent in @{talentname}, with a roll of [[1d20cs1cf20]]&le;[[(@{talentrating})+(@{misc-mod})]]"></button></td>
                     </tr>
                 </table>
                 </fieldset>
@@ -150,13 +150,13 @@
                         <tr>
                             <td class="sheet-td-dynamic50">
                                 <input type="text" name="attr_traitname" title="@{repeating_traits_$X_traitname}" class="sheet-rogue-min sheet-chrome" placeholder="Name of Trait" list="traits">
-                                <input type="text" name="attr_traitname" title="@{repeating_traits_$X_traitname}" class="sheet-rogue-min sheet-firefox" placeholder="Name of Trait" list="traits-ff">
+                                <input type="text" name="attr_traitname" title="@{repeating_traits_$X_traitname}" class="sheet-rogue-min sheet-firefox" placeholder="Name of Trait" list="traits-ff"><span></span>
                             </td>
                             <td><input type="number" class="sheet-minish" name="attr_traitpoints" title="@{repeating_traits_$X_traitpoints}" value="0"></td>
-                            <td class="sheet-td-dynamic50"><input type="text" class="sheet-attr-min" name="attr_traitstatnum" title="@{repeating_traits_$X_traitstatnum}" placeholder="@{abilityScore}" list="sub-ability-scores"></td>
+                            <td class="sheet-td-dynamic50"><input type="text" class="sheet-attr-min" name="attr_traitstatnum" title="@{repeating_traits_$X_traitstatnum}" placeholder="@{abilityScore}" list="sub-ability-scores"><span></span></td>
                             <td>&plusmn;</td>
                             <td><input type="text" class="sheet-min" name="attr_traitmod" title="@{repeating_traits_$X_traitmod}" value="0"></td>
-                            <td><button type="roll" name="roll_Trait" title="%{repeating_traits_$X_Trait}" value="/em tries to use their trait in @{traitname}, with a roll of [[1d20cs1cf20]]&le;[[(@{traitstatnum})+(@{traitmod})+(@{misc-mod})]] "></button>
+                            <td><button type="roll" name="roll_Trait" title="%{repeating_traits_$X_Trait}" value="/em tries to use their trait in @{traitname}, with a roll of [[1d20cs1cf20]]&le;[[(@{traitstatnum})+(@{traitmod})+(@{misc-mod})]]"></button>
                         </tr>
                     </table>
                 </fieldset>
@@ -186,10 +186,10 @@
                         <tr>
                             <td class="sheet-td-dynamic50">
                                 <input type="text" name="attr_disadname" title="@{repeating_disads_$X_disadname}" class="sheet-rogue-min sheet-chrome" placeholder="Name of Disadvantage" list="disadvantages">
-                                <input type="text" name="attr_disadname" title="@{repeating_disads_$X_disadname}" class="sheet-rogue-min sheet-firefox" placeholder="Name of Disadvantage" list="disadvantages-ff">
+                                <input type="text" name="attr_disadname" title="@{repeating_disads_$X_disadname}" class="sheet-rogue-min sheet-firefox" placeholder="Name of Disadvantage" list="disadvantages-ff"><span></span>
                             </td>
                             <td><input type="number" class="sheet-minish" name="attr_disadpoints" title="@{repeating_disads_$X_disadpoints}" value="0"></td>
-                            <td class="sheet-td-dynamic50"><input type="text" class="sheet-attr-min" name="attr_disadstatnum" title="@{repeating_disads_$X_disadstatnum}" placeholder="@{abilityScore}" list="sub-ability-scores"></td>
+                            <td class="sheet-td-dynamic50"><input type="text" class="sheet-attr-min" name="attr_disadstatnum" title="@{repeating_disads_$X_disadstatnum}" placeholder="@{abilityScore}" list="sub-ability-scores"><span></span></td>
                             <td>&plusmn;</td>
                             <td><input type="text" class="sheet-min" name="attr_disadmod" title="@{repeating_disads_$X_disadmod}" value="0"></td>
                             <td><button type="roll" name="roll_Disad" title="%{repeating_disads_$X_Disad}" value="/em tries to overcome their disadvantage in @{disadname}, with a roll of [[1d20cs1cf20]]&le;[[(@{disadstatnum})+(@{disadmod})+(@{misc-mod})]]"></button>
@@ -212,7 +212,7 @@
                     </tr>
                     </thead>
                     <tr>
-                        <td><input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-nonweaponprof" list="prof-macros" placeholder="Macro or number"/></td>
+                        <td><input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-nonweaponprof" list="prof-macros" placeholder="Macro or number"/><span></span></td>
                         <td><input type="number" name="attr_prof-slots-total-calc" title="@{prof-slots-total-calc}" class="sheet-table-dynamic" value="0" readonly/></td>
                     </tr>
                 </table>
@@ -249,10 +249,10 @@
                         <tr>
                             <td class="sheet-td-dynamic50">
                                 <input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf" class="sheet-display-min sheet-chrome" list="nonweapon-proficiencies">
-                                <input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf" class="sheet-display-min sheet-firefox" list="nonweapon-proficiencies-ff">
+                                <input type="text" name="attr_profname" title="@{repeating_profs_$X_profname}" placeholder="Name of NonWepProf" class="sheet-display-min sheet-firefox" list="nonweapon-proficiencies-ff"><span></span>
                             </td>
                             <td><input type="number" name="attr_profslots" title="@{repeating_profs_$X_profslots}" placeholder="Slots" class="sheet-short"></td>
-                            <td class="sheet-td-dynamic50"><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext-min" list="ability-scores"></td>
+                            <td class="sheet-td-dynamic50"><input type="text" name="attr_profstatnum" title="@{repeating_profs_$X_profstatnum}" placeholder="@{abilityScore}" class="sheet-maxtext-min" list="ability-scores"><span></span></td>
                             <td>&plusmn;</td>
                             <td><input type="text" name="attr_profmod" title="@{repeating_profs_$X_profmod}" value="0" class="sheet-minish"></td>
                             <td><button type="roll" name="roll_Prof" title="%{repeating_profs_$X_Prof}" value="&{template:2Echeck} {{checkvs=@{profname} Check}} {{character=@{character_name}}} {{checkroll=[[1d20cs1cf20]]}} {{checktarget=[[(@{profstatnum})+(@{profmod})+(@{misc-mod})]]}} {{color=dark-blue}}"></button></td>
@@ -270,7 +270,7 @@
                         <tr class="sheet-centering">
                             <td>
                                 <input type="text" name="attr_langname" title="@{repeating_langs_$X_langname}" placeholder="Name of Language" class="sheet-chrome" list="languages">
-                                <input type="text" name="attr_langname" title="@{repeating_langs_$X_langname}" placeholder="Name of Language" class="sheet-firefox" list="languages-ff">
+                                <input type="text" name="attr_langname" title="@{repeating_langs_$X_langname}" placeholder="Name of Language" class="sheet-firefox" list="languages-ff"><span></span>
                             </td>
                             <td><label><input type="checkbox" name="attr_lang-rw" title="@{repeating_langs_$X_lang-rw}" value="1"/><span></span></label></td>
                         </tr>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html
index 3d329b6aa6..9ad69c82ff 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-core-discipline.html
@@ -22,7 +22,7 @@
             </tr>
         </thead>
             <tr>
-                <td class="sheet-td-dynamic100"><input type="text" name="attr_#REPLACE2#" title="@{repeating_#REPLACE1#_$X_#REPLACE2#}" class="sheet-maxtext-min" list="#REPLACE8#"></td>
+                <td class="sheet-td-dynamic100"><input type="text" name="attr_#REPLACE2#" title="@{repeating_#REPLACE1#_$X_#REPLACE2#}" class="sheet-maxtext-min" list="#REPLACE8#"><span></span></td>
                 <td><input type="text" name="attr_psionic-mod#REPLACE3#" title="@{repeating_#REPLACE1#_$X_psionic-mod#REPLACE3#}" placeholder="#" class="sheet-small" value="0"></td>
                 <td><input type="text" name="attr_powerscore-nomod#REPLACE3#" title="@{repeating_#REPLACE1#_$X_powerscore-nomod#REPLACE3#}" placeholder="@{}" class="sheet-cent-min" list="ability-scores"></td>
                 <td>&plusmn;</td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html
index 49b2d2dfca..030d19cb73 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/psionics-tab/psionic-skills-and-powers-tab.html
@@ -1,6 +1,6 @@
 <div class="sheet-tab-content sheet-section-psionic-advanced">
     <h4>Psionics Revised</h4>
-    <label>This section applies to Dark Sun Campaign Setting Revised Psionics.</label>
+    <label>This section applies to the Player's Option: Skills & Powers and the Dark Sun Campaign Setting Revised Psionics.</label>
     <br>
     <br>
 
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html
index 3b19bffbfb..091eea7dff 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab.html
@@ -17,7 +17,7 @@
             </tr>
             </thead>
             <tr>
-                <td><input type="number" name="attr_nonprof-penalty" title="@{nonprof-penalty}" class="sheet-table-dynamic" value="-0" list="weapprof-penalty"/></td>
+                <td><input type="number" name="attr_nonprof-penalty" title="@{nonprof-penalty}" class="sheet-table-dynamic" value="-0" list="weapprof-penalty"/><span></span></td>
                 <td><input type="number" name="attr_famil-penalty" title="@{famil-penalty}" class="sheet-table-dynamic" value="-0" readonly/></td>
             </tr>
         </table>
@@ -32,7 +32,7 @@
             </tr>
             </thead>
             <tr>
-                <td><input type="text" name="attr_thac0-base" title="@{thac0-base}" class="sheet-spell" list="base-thac0" placeholder="Macro or number"/></td>
+                <td><input type="text" name="attr_thac0-base" title="@{thac0-base}" class="sheet-spell" list="base-thac0" placeholder="Macro or number"/><span></span></td>
                 <td><input type="number" name="attr_thac0-base-calc" title="@{thac0-base-calc}" class="sheet-table-dynamic" value="20" readonly/></td>
             </tr>
         </table>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
index c99fc09270..31522dc30a 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/players-option-weapons-tab.html
@@ -82,7 +82,7 @@
                 <td><label><input type='checkbox' name='attr_dexbonus' title="@{repeating_weapons_$X_dexbonus}" value='1'/><span></span></label></td>
                 <td>
                     <input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle sheet-chrome" list="melee-weapons">
-                    <input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle sheet-firefox" list="melee-weapons-ff">
+                    <input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle sheet-firefox" list="melee-weapons-ff"><span></span>
                 </td>
                 <td>
                     <select name="attr_prof-level" title="@{repeating_weapons_$X_prof-level}" class="sheet-table-dynamic">
@@ -166,7 +166,7 @@
                     <td><label><input type='checkbox' name='attr_dexbonus1' title="@{repeating_weapons-damage_$X_dexbonus1}" value='1'/><span></span></label></td>
                     <td>
                         <input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle sheet-chrome" list="melee-weapons">
-                        <input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle sheet-firefox" list="melee-weapons-ff">
+                        <input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle sheet-firefox" list="melee-weapons-ff"><span></span>
                     </td>
                     <td><label><input type="checkbox" name="attr_specialist-damage" title="@{repeating_weapons-damage_$X_specialist-damage}" value="2"/><span></span></label></td>
                     <td><label><input type="checkbox" name="attr_mastery-damage" title="@{repeating_weapons-damage_$X_mastery-damage}" value="3"/><span></span></label></td>
@@ -287,7 +287,7 @@
                 <td><label><input type='checkbox' name='attr_dexbonus2' title="@{repeating_weapons2_$X_dexbonus2}" value='1' checked/><span></span></label></td>
                 <td>
                     <input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle sheet-chrome" list="ranged-weapons">
-                    <input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff">
+                    <input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff"><span></span>
                 </td>
                 <td>
                     <select name="attr_prof-level2" title="@{repeating_weapons2_$X_prof-level2}" class="sheet-table-dynamic">
@@ -392,7 +392,7 @@
                     <td><label><input type='checkbox' name='attr_dexbonus3' title="@{repeating_ammo_$X_dexbonus3}" value="1"/><span></span></label></td>
                     <td>
                         <input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle sheet-chrome" list="ranged-weapons">
-                        <input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff">
+                        <input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff"><span></span>
                     </td>
                     <td><label><input type='checkbox' name='attr_specialist-damage2' title="@{repeating_ammo_$X_specialist-damage2}" value='2'/><span></span></label></td>
                     <td><label><input type='checkbox' name='attr_mastery-damage2' title="@{repeating_ammo_$X_mastery-damage2}" value='3'/><span></span></label></td>
diff --git a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
index fedba16cbb..93d61744aa 100644
--- a/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
+++ b/ADnD_2E_Revised/html/tabs/character-tab/weapons-tab/standard-weapons-tab.html
@@ -77,7 +77,7 @@
                 <td><label><input type='checkbox' name='attr_strbonus' title="@{repeating_weapons_$X_strbonus}" value='1' checked/><span></span></label></td>
                 <td>
                     <input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle sheet-chrome" list="melee-weapons">
-                    <input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle sheet-firefox" list="melee-weapons-ff">
+                    <input type="text" name="attr_weaponname" title="@{repeating_weapons_$X_weaponname}" class="sheet-middle sheet-firefox" list="melee-weapons-ff"><span></span>
                 </td>
                 <td>
                     <select name="attr_prof-level" title="@{repeating_weapons_$X_prof-level}" class="sheet-table-dynamic">
@@ -141,7 +141,7 @@
                 <td><label><input type='checkbox' name='attr_strbonus1' title="@{repeating_weapons-damage_$X_strbonus1}" value='1' checked/><span></span></label></td>
                 <td>
                     <input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle sheet-chrome" list="melee-weapons">
-                    <input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle sheet-firefox" list="melee-weapons-ff">
+                    <input type="text" name="attr_weaponname1" title="@{repeating_weapons-damage_$X_weaponname1}" class="sheet-middle sheet-firefox" list="melee-weapons-ff"><span></span>
                 </td>
                 <td><label><input type="checkbox" name="attr_specialist-damage" title="@{repeating_weapons-damage_$X_specialist-damage}" value="2"/><span></span></label></td>
                 <td><input type="text" name="attr_damadj" title="@{repeating_weapons-damage_$X_damadj}" class="sheet-table-dynamic" value="0"></td>
@@ -252,7 +252,7 @@
                 <td><label><input type='checkbox' name='attr_dexbonus2' title="@{repeating_weapons2_$X_dexbonus2}" value='1' checked/><span></span></label></td>
                 <td>
                     <input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle sheet-chrome" list="ranged-weapons">
-                    <input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff">
+                    <input type="text" name="attr_weaponname2" title="@{repeating_weapons2_$X_weaponname2}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff"><span></span>
                 </td>
                 <td>
                     <select name="attr_prof-level2" title="@{repeating_weapons2_$X_prof-level2}" class="sheet-table-dynamic">
@@ -322,7 +322,7 @@
                 <td><label><input type='checkbox' name='attr_strbonus3' title="@{repeating_ammo_$X_strbonus3}" value="1"/><span></span></label></td>
                 <td>
                     <input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle sheet-chrome" list="ranged-weapons">
-                    <input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff">
+                    <input type="text" name="attr_ammoname" title="@{repeating_ammo_$X_ammoname}" class="sheet-middle sheet-firefox" list="ranged-weapons-ff"><span></span>
                 </td>
                 <td><input type="text" name="attr_damadj2" title="@{repeating_ammo_$X_damadj2}" class="sheet-table-dynamic" value="0"></td>
                 <td><input type="text" name="attr_damsm2" title="@{repeating_ammo_$X_damsm2}" class="sheet-short"></td>
diff --git a/ADnD_2E_Revised/pug/spellTemplate.pug b/ADnD_2E_Revised/pug/spellTemplate.pug
index c62cca5f44..932c4c96c4 100644
--- a/ADnD_2E_Revised/pug/spellTemplate.pug
+++ b/ADnD_2E_Revised/pug/spellTemplate.pug
@@ -16,6 +16,7 @@ fieldset(name="repeating_spells-#REPLACE0#" class="repeating_spells-#REPLACE0#")
                 td(class="sheet-td-dynamic50")
                     input(type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" class="sheet-table-dynamic sheet-chrome" placeholder="Spell name" list="#REPLACE0#-spells")
                     input(type="text" name="attr_spell-name" title="@{repeating_spells-#REPLACE0#_$X_spell-name}" class="sheet-table-dynamic sheet-firefox" placeholder="Spell name" list="#REPLACE0#-spells-ff")
+                    span
                 td(class="sheet-td-dynamic25")
                     input(type="text" name="attr_spell-range" title="@{repeating_spells-#REPLACE0#_$X_spell-range}" class="sheet-table-dynamic" placeholder="Range")
                 td(class="sheet-td-dynamic25")