diff --git a/DnDNext/D&DNext.html b/DnDNext/D&DNext.html
index 18a8e34760..589c821952 100644
--- a/DnDNext/D&DNext.html
+++ b/DnDNext/D&DNext.html
@@ -415,9 +415,9 @@
         <table style="width: 100%;">
             <tbody>
                 <tr>
-                    <td><button type='roll' name='roll_checkorsave' value='?{Description}[[1d20+?{Modifiers|0}]]' style="font-family: Times New Roman; font-size: 18px;"><b>Saving Throw</b></button></td>
+                    <td><button type='roll' name='roll_checkorsave' value='Attempts a ?{What type of save?} saving throw. [[1d20+?{Modifiers|0}]]' style="font-family: Times New Roman; font-size: 18px;"><b>Saving Throw</b></button></td>
                     <td><button type='roll' name='roll_initiative' value='@{selected|token_name} rolls a [[1d20+@{selected|Initiative}&{tracker}]] for initiative!' style="font-family: Times New Roman; font-size: 18px;" title="Requires token to be selected."><b>Initiative Roll</b></button></td>
-                    <td><button type='roll' name='roll_recovery' value='Takes a moment to tend to their wounds and heals [[?{How Many HD (#d#?) are you using?|0}]] points of damage.' style="font-family: Times New Roman; font-size: 18px;"><b>Recovery Roll</b></button></td>
+                    <td><button type='roll' name='roll_shortrest' value='Rests and tends to their wounds healing [[?{How Many HD (#d#?) are you using?|0}]] points of damage.' style="font-family: Times New Roman; font-size: 18px;"><b>Short Rest</b></button></td>
                 </tr>
             </tbody>
         </table>
@@ -440,7 +440,7 @@
                 <tr>
                     <td><input type="text" name="attr_weapon1"></td>
                     <td><button type='roll' name='roll_weapon1' value='Attacks and rolls a [[1d20+@{attack1}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack1" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage1' value='Does [[@{damage1}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage1" style="width: 60px;"></td>
+                    <td><button type='roll' name='roll_damage1' value='Does [[@{damage1}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage1" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type1" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range1" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo1" style="width: 50px;"></td>
@@ -450,7 +450,7 @@
                 <tr>
                     <td><input type="text" name="attr_weapon2"></td>
                     <td><button type='roll' name='roll_weapon2' value='Attacks and rolls a [[1d20+@{attack2}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack2" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage2' value='Does [[@{damage2}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage2" style="width: 60px;"></td>
+                    <td><button type='roll' name='roll_damage2' value='Does [[@{damage2}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage2" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type2" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range2" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo2" style="width: 50px;"></td>
@@ -460,7 +460,7 @@
                 <tr>
                     <td><input type="text" name="attr_weapon3"></td>
                     <td><button type='roll' name='roll_weapon3' value='Attacks and rolls a [[1d20+@{attack3}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack3" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage3' value='Does [[@{damage3}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage3" style="width: 60px;"></td>
+                    <td><button type='roll' name='roll_damage3' value='Does [[@{damage3}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage3" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type3" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range3" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo3" style="width: 50px;"></td>
@@ -470,7 +470,7 @@
                 <tr>
                     <td><input type="text" name="attr_weapon4"></td>
                     <td><button type='roll' name='roll_weapon4' value='Attacks and rolls a [[1d20+@{attack4}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack4" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage4' value='Does [[@{damage4}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage4" style="width: 60px;"></td>
+                    <td><button type='roll' name='roll_damage4' value='Does [[@{damage4}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage4" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type4" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range4" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo4" style="width: 50px;"></td>
@@ -480,7 +480,7 @@
                 <tr>
                     <td><input type="text" name="attr_weapon5"></td>
                     <td><button type='roll' name='roll_weapon5' value='Attacks and rolls a [[1d20+@{attack5}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack5" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage5' value='Does [[@{damage5}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage5" style="width: 60px;"></td>
+                    <td><button type='roll' name='roll_damage5' value='Does [[@{damage5}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage5" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type5" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range5" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo5" style="width: 50px;"></td>
@@ -490,7 +490,7 @@
                  <tr>
                     <td><input type="text" name="attr_weapon6"></td>
                     <td><button type='roll' name='roll_weapon6' value='Attacks and rolls a [[1d20+@{attack6}+?{MiscMod|0}]]!'></button><input type="text" name="attr_attack6" style="width: 50px;"></td>
-                    <td><button type='roll' name='roll_damage6' value='Does [[@{damage6}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage6" style="width: 60px;"></td>
+                    <td><button type='roll' name='roll_damage6' value='Does [[@{damage6}+?{MiscMod|0}]] points of damage!'></button><input type="text" name="attr_damage6" style="width: 100px;"></td>
                     <td><input type="text" name="attr_type6" style="width: 50px;"></td>
                     <td><input type="text" name="attr_range6" style="width: 75px;"></td>
                     <td><input type="text" name="attr_ammo6" style="width: 50px;"></td>
@@ -514,18 +514,18 @@
                     <td>PROPERTIES</td>
                     <td>WEIGHT</td>
                 <tr>
-                    <td><input type="text" name="attr_armor1"></td>
+                    <td><input type="text" name="attr_armor1" style="width: 200px;"></td>
                     <td><input type="text" name="attr_base1" style="width: 75px;"></td>
-                    <td><input type="text" name="attr_maxdex1" style="width: 50px;"></td>
+                    <td><input type="text" name="attr_maxdex1" style="width: 60px;"></td>
                     <td><input type="text" name="attr_astealth1"></td>
                     <td><input type="text" name="attr_aspeed1" style="width: 50px;"></td>
                     <td><input type="text" name="attr_aproperties1" ></td>
                     <td><input type="text" name="attr_aweight1" style="width: 50px;"></td>
                 </tr>
                 <tr>
-                    <td><input type="text" name="attr_armor2"></td>
+                    <td><input type="text" name="attr_armor2" style="width: 200px;"></td>
                     <td><input type="text" name="attr_base2" style="width: 75px;"></td>
-                    <td><input type="text" name="attr_maxdex2" style="width: 50px;"></td>
+                    <td><input type="text" name="attr_maxdex2" style="width: 60px;"></td>
                     <td><input type="text" name="attr_astealth2"></td>
                     <td><input type="text" name="attr_aspeed2" style="width: 50px;"></td>
                     <td><input type="text" name="attr_aproperties2"></td>
@@ -539,30 +539,26 @@
 <div>
 <h3 style="text-align: center;">Spellcasting</h3>    
 </div>
+<div class="sheet-3colrow">
 <div class="sheet-col">
         <table align="center">
             <tbody>
                 <tr>
-                    <td><label>Magic Ability</label></td>
-                    <td>
-                        <select name="attr_magic-ability" style="width: 65px;">&nbsp;
+                    <td>Magic Ability</td><td></td>
+                    <td><select name="attr_magic-ability" style="width: 65px;">
                             <option>None</option>
                             <option value="@{IntMod}">INT</option>
                             <option value="@{WisMod}">WIS</option>
                             <option value="@{ChaMod}">CHA</option>
-                        </select>
-                    </td>
-                    <td><label>&nbsp;Spell Save DC</label></td>
+                        </select></td>
+                </tr>
+                <tr>
+                    <td>Spell Save DC</td><td></td>
                     <td><input type="number" name="attr_spellsavedc" value="8+@{magic-ability}+@{PB}" disabled="true"></td>
                 </tr>
             </tbody>
         </table>
-    </div>
-</div>
-<br/>
-<br/>
-<div class="sheet-3colrow">
-    <div class="sheet-col">
+        <hr style="border: 1px solid #000000;"/>
         <table align="center">
             <tbody>
                 <tr>
@@ -609,106 +605,103 @@
         </table>
     </div>
     <div class="sheet-col">
-        <h4>Spells Prepared</h4><textarea name="attr_spellsprepared"></textarea><br/>
-        <h4>Spells Known</h4><textarea name="attr_spellsknown"></textarea>
-    </div>
-    <div class="sheet-col">
-        <table align="center">
+        <table align="center" width="100%">
             <tbody>
                 <tr>
-                    <td><label>Attack Spells</label></td>
-                    <td><label>Attack</label></td>
-                    <td><label>Damage</label></td>
+                    <td>Attack Spells</td>
+                    <td></td>
+                    <td>Attack</td>
+                    <td></td>
+                    <td>Damage</td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell1" style="width: 100px"></td>
-                    <td>
-                    <button type='roll' name='roll_spell1' value='Attempts to hit with a spell rolling a [[1d20+@{spell1}+?{MiscMod|0}]]!'></button>
-                    <input type="number" name="attr_spell1" style="width: 40px">
-                    </td>
-                    <td>
-                    <button type='roll' name='roll_spell1' value='Does [[@{spdmg1}+?{MiscMod|0}]] points of damage!'></button>
-                    <input type="text" name="attr_spdmg1" style="width: 40px">
-                    </td>
+                    <td><button type='roll' name='roll_spell1' value='Attempts to hit with a spell rolling a [[1d20+@{spell1}+?{MiscMod|0}]]!'></button></td>
+                    <td><input type="number" name="attr_spell1" style="width: 40px"></td>
+                    <td><button type='roll' name='roll_spell1' value='Does [[@{spdmg1}+?{MiscMod|0}]] points of damage!'></button></td>
+                    <td><input type="text" name="attr_spdmg1" style="width: 50px"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell2" style="width: 100px"></td>
-                    <td>
-                    <button type='roll' name='roll_spell2' value='Attempts to hit with a spell rolling a [[1d20+@{spell2}+?{MiscMod|0}]]!'></button>
-                    <input type="number" name="attr_spell2" style="width: 40px">
-                    </td>
-                    <td>
-                    <button type='roll' name='roll_spell2' value='Does [[@{spdmg2}+?{MiscMod|0}]] points of damage!'></button>
-                    <input type="text" name="attr_spdmg2" style="width: 40px">
-                    </td>
+                    <td><button type='roll' name='roll_spell2' value='Attempts to hit with a spell rolling a [[1d20+@{spell2}+?{MiscMod|0}]]!'></button></td>
+                    <td><input type="number" name="attr_spell2" style="width: 40px"></td>
+                    <td><button type='roll' name='roll_spell2' value='Does [[@{spdmg2}+?{MiscMod|0}]] points of damage!'></button></td>
+                    <td><input type="text" name="attr_spdmg2" style="width: 50px"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell3" style="width: 100px"></td>
-                    <td>
-                    <button type='roll' name='roll_spell3' value='Attempts to hit with a spell rolling a [[1d20+@{spell3}+?{MiscMod|0}]]!'></button>
-                    <input type="number" name="attr_spell3" style="width: 40px">
-                    </td>
-                    <td>
-                    <button type='roll' name='roll_spell3' value='Does [[@{spdmg3}+?{MiscMod|0}]] points of damage!'></button>
-                    <input type="text" name="attr_spdmg3" style="width: 40px">
-                    </td>
+                    <td><button type='roll' name='roll_spell3' value='Attempts to hit with a spell rolling a [[1d20+@{spell3}+?{MiscMod|0}]]!'></button></td>
+                    <td><input type="number" name="attr_spell3" style="width: 40px"></td>
+                    <td><button type='roll' name='roll_spell3' value='Does [[@{spdmg3}+?{MiscMod|0}]] points of damage!'></button></td>
+                    <td><input type="text" name="attr_spdmg3" style="width: 50px"></td>
                 </tr>
                 <tr>
                     <td><input type="text" name="attr_aspell4" style="width: 100px"></td>
-                    <td>
-                    <button type='roll' name='roll_spell4' value='Attempts to hit with a spell rolling a [[1d20+@{spell4}+?{MiscMod|0}]]!'></button>
-                    <input type="number" name="attr_spell4" style="width: 40px">
-                    </td>
-                    <td>
-                    <button type='roll' name='roll_spell4' value='Does [[@{spdmg4}+?{MiscMod|0}]] of damage!'></button>
-                    <input type="text" name="attr_spdmg4" style="width: 40px">
-                    </td>
+                    <td><button type='roll' name='roll_spell4' value='Attempts to hit with a spell rolling a [[1d20+@{spell4}+?{MiscMod|0}]]!'></button></td>
+                    <td><input type="number" name="attr_spell4" style="width: 40px"></td>
+                    <td><button type='roll' name='roll_spell4' value='Does [[@{spdmg4}+?{MiscMod|0}]] of damage!'></button></td>
+                    <td><input type="text" name="attr_spdmg4" style="width: 50px"></td>
                 </tr>
             </tbody>
         </table>
         <br/>
-        <br/>
-        <table align="center">
+        <table align="left">
             <tbody>
                 <tr>
-                    <td><label>Healing Spells</label></td>
-                    <td><label>Dice</label></td>
+                    <td>Healing Spells</td>
+                    <td></td>
+                    <td>Dice</td>
                 </tr>
                 <tr>
-                    <td>&nbsp;<input type="text" name="attr_hspell1" style="width: 100px"></td>
-                    <td>
-                    <button type='roll' name='roll_hspelld1' value='[[@{hspelld1}+?{MiscMod|0}]] hit points are healed!'></button>
-                    <input type="text" name="attr_hspelld1" style="width: 50px;">&nbsp;
-                    </td>
+                    <td><input type="text" name="attr_hspell1" style="width: 100px"></td>
+                    <td><button type='roll' name='roll_hspelld1' value='[[@{hspelld1}+?{MiscMod|0}]] hit points are healed!'></button></td>
+                    <td><input type="text" name="attr_hspelld1" style="width: 50px;"></td>
                 </tr>
                 <tr>
-                    <td>&nbsp;<input type="text" name="attr_hspell2" style="width: 100px"></td>
-                    <td>
-                    <button type='roll' name='roll_hspelld2' value='[[@{hspelld2}+?{MiscMod|0}]] hit points are healed!'></button>
-                    <input type="text" name="attr_hspelld2" style="width: 50px;">&nbsp;
-                    </td>
+                    <td><input type="text" name="attr_hspell2" style="width: 100px"></td>
+                    <td><button type='roll' name='roll_hspelld2' value='[[@{hspelld2}+?{MiscMod|0}]] hit points are healed!'></button></td>
+                    <td><input type="text" name="attr_hspelld2" style="width: 50px;"></td>
+                </tr>
+            </tbody>
+        </table>
+        <table align="right">
+            <tbody>    
+                <tr>
+                    <td><h4>Spells Prepared</h4><textarea name="attr_spellsprepared" style="width: 300px;"></textarea></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="sheet-col">
+        <table align="right">
+            <tbody>    
+                <tr>
+                    <td><h4>Spells Known</h4><textarea name="attr_spellsknown" style="height: 372px; width: 250px;"></textarea></td>
                 </tr>
             </tbody>
         </table>
     </div>
 </div>
 <hr style="border: 1px solid #000000;"/>
-<div class="sheet-4colrow">
+<div class="sheet-2colrow">
     <h3 style="text-align: center;">Equipment & Treasure</h3>
     <div class="sheet-col">
-        <table align="center">
+        <table align="center" style="sheet-short" cellspacing="10">
             <tbody>
                 <tr>
-                    <td><label>Carrying Capacity</label><br/><input type="number" name="attr_totalcarried" style="width: 75px">/<input type="number" name="attr_CarryingCapacity" value="@{strength}*10" disabled="true" style="width: 75px"><b>Lbs.</b></td>
+                    <td>Carrying Capacity</td><td></td><td><input type="number" name="attr_totalcarried" style="width: 75px">/<input type="number" name="attr_CarryingCapacity" value="@{strength}*10" disabled="true" style="width: 75px"><b>Lbs.</b></td>
                 </tr>
                 <tr>
-                    <td><h4 style="text-align: center; color: #000000;"><br/>Magic Items</h4><textarea name="attr_magicitems" style="height: 400px; width: 250px;"></textarea></td>  
+                    <td>Max. Load</td><td></td><td><input type="number" name="attr_MaxLoad" value="@{strength}*20" disabled="true" style="width: 75px"><b>Lbs.</b></td>
                 </tr>
-            </tbody>
+                <tr>
+                    <td>Push, Drag & Lift</td><td></td><td><input type="number" name="attr_PushDragLift" value="@{CarryingCapacity}*5" disabled="true" style="width: 75px"><b>Lbs.</b></td>
+                </tr>
+             </tbody>
         </table>
     </div>
     <div class="sheet-col">
-        <table align="center">
+    <table align="center" style="sheet-short">
             <tbody>
                 <tr>
                     <td>cp<br/><input type="number" name="attr_copperpieces" style="width: 75px;"></td>
@@ -719,13 +712,26 @@
                 </tr>
             </tbody>
         </table>
-        <table align="center">
+    </div>
+</div>
+<div class="sheet-2colrow">
+    <div class="sheet-col">
+         <table align="left" style="sheet-short">
+            <tbody>
+                <tr>
+                    <td><h4 style="text-align: center; color: #000000;"><br/>Magic Items</h4><textarea name="attr_magicitems" style="height: 474px; width: 250px;"></textarea></td>  
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="sheet-col">
+        <table align="right" style="sheet-short">
             <tbody>
                 <tr>
                     <td><h4 style="text-align: center; color: #000000;">Treasure, Gems & Art Objects</h4><textarea name="attr_gemsandartobjects" style="height: 100px; width: 550px;"></textarea></td>  
                 </tr>
                 <tr>
-                    <td><h4 style="text-align: center; color: #000000;">Equipment</h4><textarea name="attr_equipment" style="height: 309px; width: 550px;"></textarea></td>  
+                    <td><h4 style="text-align: center; color: #000000;">Equipment</h4><textarea name="attr_equipment" style="height: 355px; width: 550px;"></textarea></td>  
                 </tr>
             </tbody>
         </table>