diff --git a/D&D_OED/DnD_OED.html b/D&D_OED/DnD_OED.html
index 0df6f5f8b8..605187532c 100644
--- a/D&D_OED/DnD_OED.html
+++ b/D&D_OED/DnD_OED.html
@@ -19,8 +19,9 @@
             <span class="grid-16-span-3"><label data-i18n="player-u">Player:</label></span>
             <span class="grid-16-span-5"><input  class="fill" name="attr_player_name" tabindex="2" title="@{player_name}" type="text" /></span>
             <!-- row 2 -->
-            <span class="grid-16-span-3"><label data-i18n="raceClass-u">Race/Class:</label></span>
+            <span class="grid-16-span-3"><label data-i18n="raceClass-u">Class/Level:</label></span>
             <span class="grid-16-span-5"><input class="fill" name="attr_class" tabindex="3" title="@{class}" type="text" /></span>
+            <input type="hidden" name="attr_top_level" value="0">
             <span class="grid-16-span-3"><label data-i18n="alignment-u">Alignment:</label></span>
             <span class="grid-16-span-5"><input  class="fill" name="attr_alignment" tabindex="4" title="@{alignment}" type="text" /></span>
             <!-- row 3 -->
@@ -80,7 +81,7 @@
             <span class="grid-16-span-8"><label class="line-height-20" data-i18n="languages-u">LANGUAGES</label></span>
             <span class="grid-16-span-4"><label class="line-height-20" data-i18n="experience-u">EXPERIENCE</label></span>
             <span class="grid-16-span-2"><label class="line-height-20" data-i18n="saves-u">SAVES</label></span>
-            <span class="grid-16-span-2"><button type="roll" name="roll_saves" value="?{Choose:|Spells,@{character_name} saves vs. Spells: [[1d20 + @{max_level} + 0]] |Breath,@{character_name} saves vs. Breath: [[1d20 + @{max_level} + 1]]|Stone,@{character_name} saves vs. Stone: [[1d20 + @{max_level} + 2]]|Wands,@{character_name} saves vs. Wands: [[1d20 + @{max_level} + 3]]|Death,@{character_name} saves vs. Death: [[1d20 + @{max_level} + 4]]}"></button></span>
+            <span class="grid-16-span-2"><button type="roll" name="roll_saves" value="?{Choose:|Spells,@{character_name} saves vs. Spells: [[1d20 + @{top_level} + 0]] |Breath,@{character_name} saves vs. Breath: [[1d20 + @{top_level} + 1]]|Stone,@{character_name} saves vs. Stone: [[1d20 + @{top_level} + 2]]|Wands,@{character_name} saves vs. Wands: [[1d20 + @{top_level} + 3]]|Death,@{character_name} saves vs. Death: [[1d20 + @{top_level} + 4]]}"></button></span>
             <!-- row 12 -->
             <span class="grid-16-span-4"><input class="fill line-height-28" name="attr_languages_1" tabindex="23" title="@{languages_1}" type="text" /></span>
             <span class="grid-16-span-4"><input class="fill line-height-28" name="attr_languages_2" tabindex="24" title="@{languages_2}" type="text" /></span>  
@@ -465,8 +466,8 @@
         });
     });
     
-    // Parse out max level from class field
-    on ("sheet:opened change:class", function() {
+    // Parse out top level from class field
+    on ("change:class", function() {
         getAttrs(["class"], function(val) {
             const str = val.class;
             var num = 0, res = 0;
@@ -482,7 +483,7 @@
                 }
             }
             var finalVal = Math.max(res, num);
-            setAttrs({max_level: finalVal});
+            setAttrs({top_level: finalVal});
         });
     });
 </script>
\ No newline at end of file
diff --git a/D&D_OED/translation.json b/D&D_OED/translation.json
index 6d2b346a1b..e185d64c61 100644
--- a/D&D_OED/translation.json
+++ b/D&D_OED/translation.json
@@ -4,7 +4,7 @@
     "spellbookButton-u":"Spellbook",
     "name-u":"Character:",
     "player-u":"Player:",
-    "raceClass-u":"Race/Class:",
+    "raceClass-u":"Class/Level:",
     "alignment-u":"Alignment:",
     "abilities-u":"ABILITIES",
     "str-u":"STRENGTH",
@@ -21,6 +21,7 @@
     "experience-u":"EXPERIENCE",
     "nextLevel-u": "Next Level:",
     "hpPerClass-u": "Max Hits:",
+    "saves-u": "SAVES",
     "attacks-u": "ATTACKS",
     "weapon-u": "Weapon",
     "attack-u": "Attack",