diff --git a/ADnD 2E Revised/2ESheet.html b/ADnD 2E Revised/2ESheet.html
index d9ef8d5424..a77ba7805e 100644
--- a/ADnD 2E Revised/2ESheet.html	
+++ b/ADnD 2E Revised/2ESheet.html	
@@ -11684,31 +11684,6 @@
                                 <td colspan="4"><button type="roll" name="roll_spellcast401" title="%{spellcast401}" value="@{cast-macro401}">Roll Spell Effects</button></td>
                             </tr>
                         </table>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td colspan="4"><input type="text" name="attr_spellname404" title="@{spellname404}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Cast Today: </label></td>
-                                <td><input type="number" name="attr_cast-value404" title="@{cast-value404}" value="0" class="sheet-short"></td>
-                                <td class="sheet-centering-padding-2"><label>/</label></td>
-                                <td><input type="number" name="attr_cast-max404" title="@{cast-max404}" class="sheet-short"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Casting Time: </label></td>
-                                <td><input type="text" name="attr_casttime404" title="@{casttime404}" class="sheet-short"></td>
-                                <td></td>
-                                <td><button type="roll" style="margin: 0;" name="roll_initspell404" title="%{initspell404}" value="/gmroll [[{([[1d10]]+@{casttime404}), 1}kh1]] [Initiative (@{spellname404})]&{tracker}">Initiative</button></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><textarea name="attr_cast-macro404" title="@{cast-macro404}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><button type="roll" name="roll_spellcast404" title="%{spellcast404}" value="@{cast-macro404}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
                     </div>
                     <div class="sheet-col">
                         <table class="sheet-table-center">
@@ -11734,31 +11709,6 @@
                                 <td colspan="4"><button type="roll" name="roll_spellcast402" title="%{spellcast402}" value="@{cast-macro402}">Roll Spell Effects</button></td>
                             </tr>
                         </table>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td colspan="4"><input type="text" name="attr_spellname405" title="@{spellname405}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Cast Today: </label></td>
-                                <td><input type="number" name="attr_cast-value405" title="@{cast-value405}" value="0" class="sheet-short"></td>
-                                <td class="sheet-centering-padding-2"><label>/</label></td>
-                                <td><input type="number" name="attr_cast-max405" title="@{cast-max405}" class="sheet-short"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Casting Time: </label></td>
-                                <td><input type="text" name="attr_casttime405" title="@{casttime405}" class="sheet-short"></td>
-                                <td></td>
-                                <td><button type="roll" style="margin: 0;" name="roll_initspell405" title="%{initspell405}" value="/gmroll [[{([[1d10]]+@{casttime405}), 1}kh1]] [Initiative (@{spellname405})]&{tracker}">Initiative</button></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><textarea name="attr_cast-macro405" title="@{cast-macro405}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><button type="roll" name="roll_spellcast405" title="%{spellcast405}" value="@{cast-macro405}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
                     </div>
                     <div class="sheet-col">
                         <table class="sheet-table-center">
@@ -11784,8 +11734,62 @@
                                 <td colspan="4"><button type="roll" name="roll_spellcast403" title="%{spellcast403}" value="@{cast-macro403}">Roll Spell Effects</button></td>
                             </tr>
                         </table>
-                        <br>
-                        <br>
+                    </div>
+                </div>
+                <br>
+                <br>
+                <div class="sheet-3colrow">
+                    <div class="sheet-col">
+                        <table class="sheet-table-center">
+                            <tr>
+                                <td colspan="4"><input type="text" name="attr_spellname404" title="@{spellname404}" class="sheet-spell" placeholder="Spell name"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Cast Today: </label></td>
+                                <td><input type="number" name="attr_cast-value404" title="@{cast-value404}" value="0" class="sheet-short"></td>
+                                <td class="sheet-centering-padding-2"><label>/</label></td>
+                                <td><input type="number" name="attr_cast-max404" title="@{cast-max404}" class="sheet-short"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Casting Time: </label></td>
+                                <td><input type="text" name="attr_casttime404" title="@{casttime404}" class="sheet-short"></td>
+                                <td></td>
+                                <td><button type="roll" style="margin: 0;" name="roll_initspell404" title="%{initspell404}" value="/gmroll [[{([[1d10]]+@{casttime404}), 1}kh1]] [Initiative (@{spellname404})]&{tracker}">Initiative</button></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><textarea name="attr_cast-macro404" title="@{cast-macro404}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><button type="roll" name="roll_spellcast404" title="%{spellcast404}" value="@{cast-macro404}">Roll Spell Effects</button></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="sheet-col">
+                        <table class="sheet-table-center">
+                            <tr>
+                                <td colspan="4"><input type="text" name="attr_spellname405" title="@{spellname405}" class="sheet-spell" placeholder="Spell name"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Cast Today: </label></td>
+                                <td><input type="number" name="attr_cast-value405" title="@{cast-value405}" value="0" class="sheet-short"></td>
+                                <td class="sheet-centering-padding-2"><label>/</label></td>
+                                <td><input type="number" name="attr_cast-max405" title="@{cast-max405}" class="sheet-short"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Casting Time: </label></td>
+                                <td><input type="text" name="attr_casttime405" title="@{casttime405}" class="sheet-short"></td>
+                                <td></td>
+                                <td><button type="roll" style="margin: 0;" name="roll_initspell405" title="%{initspell405}" value="/gmroll [[{([[1d10]]+@{casttime405}), 1}kh1]] [Initiative (@{spellname405})]&{tracker}">Initiative</button></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><textarea name="attr_cast-macro405" title="@{cast-macro405}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><button type="roll" name="roll_spellcast405" title="%{spellcast405}" value="@{cast-macro405}">Roll Spell Effects</button></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="sheet-col">
                         <table class="sheet-table-center">
                             <tr>
                                 <td colspan="4"><input type="text" name="attr_spellname406" title="@{spellname406}" class="sheet-spell" placeholder="Spell name"></td>
@@ -12029,31 +12033,6 @@
                                     <td colspan="4"><button type="roll" name="roll_spellcast407" title="%{repeating_hench2_$X_spellcast407}" value="@{cast-macro407}">Roll Spell Effects</button></td>
                                 </tr>
                             </table>
-                            <br>
-                            <br>
-                            <table class="sheet-table-center">
-                                <tr>
-                                    <td colspan="4"><input type="text" name="attr_spellname410" title="@{repeating_hench2_$X_spellname410}" class="sheet-spell" placeholder="Spell name"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Cast Today: </label></td>
-                                    <td><input type="number" name="attr_cast-value410" title="@{repeating_hench2_$X_cast-value410}" value="0" class="sheet-short"></td>
-                                    <td class="sheet-centering-padding-2"><label>/</label></td>
-                                    <td><input type="number" name="attr_cast-max410" title="@{repeating_hench2_$X_cast-max410}" class="sheet-short"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Casting Time: </label></td>
-                                    <td><input type="text" name="attr_casttime410" title="@{repeating_hench2_$X_casttime410}" class="sheet-short"></td>
-                                    <td></td>
-                                    <td><button type="roll" style="margin: 0;" name="roll_initspell410" title="%{repeating_hench2_$X_initspell410}" value="/gmroll [[{([[1d10]]+@{casttime410}), 1}kh1]] [Initiative (@{spellname410})]&{tracker}">Initiative</button></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><textarea name="attr_cast-macro410" title="@{repeating_hench2_$X_cast-macro410}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><button type="roll" name="roll_spellcast410" title="%{repeating_hench2_$X_spellcast410}" value="@{cast-macro410}">Roll Spell Effects</button></td>
-                                </tr>
-                            </table>
                         </div>
                         <div class="sheet-col">
                             <table class="sheet-table-center">
@@ -12079,31 +12058,6 @@
                                     <td colspan="4"><button type="roll" name="roll_spellcast408" title="%{repeating_hench2_$X_spellcast408}" value="@{cast-macro408}">Roll Spell Effects</button></td>
                                 </tr>
                             </table>
-                            <br>
-                            <br>
-                            <table class="sheet-table-center">
-                                <tr>
-                                    <td colspan="4"><input type="text" name="attr_spellname411" title="@{repeating_hench2_$X_spellname411}" class="sheet-spell" placeholder="Spell name"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Cast Today: </label></td>
-                                    <td><input type="number" name="attr_cast-value411" title="@{repeating_hench2_$X_cast-value411}" value="0" class="sheet-short"></td>
-                                    <td class="sheet-centering-padding-2"><label>/</label></td>
-                                    <td><input type="number" name="attr_cast-max411" title="@{repeating_hench2_$X_cast-max411}" class="sheet-short"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Casting Time: </label></td>
-                                    <td><input type="text" name="attr_casttime411" title="@{repeating_hench2_$X_casttime411}" class="sheet-short"></td>
-                                    <td></td>
-                                    <td><button type="roll" style="margin: 0;" name="roll_initspell411" title="%{repeating_hench2_$X_initspell411}" value="/gmroll [[{([[1d10]]+@{casttime411}), 1}kh1]] [Initiative (@{spellname411})]&{tracker}">Initiative</button></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><textarea name="attr_cast-macro411" title="@{repeating_hench2_$X_cast-macro411}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><button type="roll" name="roll_spellcast411" title="%{repeating_hench2_$X_spellcast411}" value="@{cast-macro411}">Roll Spell Effects</button></td>
-                                </tr>
-                            </table>
                         </div>
                         <div class="sheet-col">
                             <table class="sheet-table-center">
@@ -12129,8 +12083,62 @@
                                     <td colspan="4"><button type="roll" name="roll_spellcast409" title="%{repeating_hench2_$X_spellcast409}" value="@{cast-macro409}">Roll Spell Effects</button></td>
                                 </tr>
                             </table>
-                            <br>
-                            <br>
+                        </div>
+                    </div>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname410" title="@{repeating_hench2_$X_spellname410}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value410" title="@{repeating_hench2_$X_cast-value410}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max410" title="@{repeating_hench2_$X_cast-max410}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime410" title="@{repeating_hench2_$X_casttime410}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell410" title="%{repeating_hench2_$X_initspell410}" value="/gmroll [[{([[1d10]]+@{casttime410}), 1}kh1]] [Initiative (@{spellname410})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro410" title="@{repeating_hench2_$X_cast-macro410}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast410" title="%{repeating_hench2_$X_spellcast410}" value="@{cast-macro410}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname411" title="@{repeating_hench2_$X_spellname411}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value411" title="@{repeating_hench2_$X_cast-value411}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max411" title="@{repeating_hench2_$X_cast-max411}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime411" title="@{repeating_hench2_$X_casttime411}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell411" title="%{repeating_hench2_$X_initspell411}" value="/gmroll [[{([[1d10]]+@{casttime411}), 1}kh1]] [Initiative (@{spellname411})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro411" title="@{repeating_hench2_$X_cast-macro411}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast411" title="%{repeating_hench2_$X_spellcast411}" value="@{cast-macro411}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
                             <table class="sheet-table-center">
                                 <tr>
                                     <td colspan="4"><input type="text" name="attr_spellname412" title="@{repeating_hench2_$X_spellname412}" class="sheet-spell" placeholder="Spell name"></td>
@@ -12379,31 +12387,6 @@
                                 <td colspan="4"><button type="roll" name="roll_spellcast413" title="%{spellcast413}" value="@{cast-macro413}">Roll Spell Effects</button></td>
                             </tr>
                         </table>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td colspan="4"><input type="text" name="attr_spellname416" title="@{spellname416}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Cast Today: </label></td>
-                                <td><input type="number" name="attr_cast-value416" title="@{cast-value416}" value="0" class="sheet-short"></td>
-                                <td class="sheet-centering-padding-2"><label>/</label></td>
-                                <td><input type="number" name="attr_cast-max416" title="@{cast-max416}" class="sheet-short"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Casting Time: </label></td>
-                                <td><input type="text" name="attr_casttime416" title="@{casttime416}" class="sheet-short"></td>
-                                <td></td>
-                                <td><button type="roll" style="margin: 0;" name="roll_initspell416" title="%{initspell416}" value="/gmroll [[{([[1d10]]+@{casttime416}), 1}kh1]] [Initiative (@{spellname416})]&{tracker}">Initiative</button></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><textarea name="attr_cast-macro416" title="@{cast-macro416}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><button type="roll" name="roll_spellcast416" title="%{spellcast416}" value="@{cast-macro416}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
                     </div>
                     <div class="sheet-col">
                         <table class="sheet-table-center">
@@ -12429,31 +12412,6 @@
                                 <td colspan="4"><button type="roll" name="roll_spellcast414" title="%{spellcast414}" value="@{cast-macro414}">Roll Spell Effects</button></td>
                             </tr>
                         </table>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td colspan="4"><input type="text" name="attr_spellname417" title="@{spellname417}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Cast Today: </label></td>
-                                <td><input type="number" name="attr_cast-value417" title="@{cast-value417}" value="0" class="sheet-short"></td>
-                                <td class="sheet-centering-padding-2"><label>/</label></td>
-                                <td><input type="number" name="attr_cast-max417" title="@{cast-max417}" class="sheet-short"></td>
-                            </tr>
-                            <tr>
-                                <td><label>Casting Time: </label></td>
-                                <td><input type="text" name="attr_casttime417" title="@{casttime417}" class="sheet-short"></td>
-                                <td></td>
-                                <td><button type="roll" style="margin: 0;" name="roll_initspell417" title="%{initspell417}" value="/gmroll [[{([[1d10]]+@{casttime417}), 1}kh1]] [Initiative (@{spellname417})]&{tracker}">Initiative</button></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><textarea name="attr_cast-macro417" title="@{cast-macro417}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                            </tr>
-                            <tr>
-                                <td colspan="4"><button type="roll" name="roll_spellcast417" title="%{spellcast417}" value="@{cast-macro417}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
                     </div>
                     <div class="sheet-col">
                         <table class="sheet-table-center">
@@ -12479,8 +12437,62 @@
                                 <td colspan="4"><button type="roll" name="roll_spellcast415" title="%{spellcast415}" value="@{cast-macro415}">Roll Spell Effects</button></td>
                             </tr>
                         </table>
-                        <br>
-                        <br>
+                    </div>
+                </div>
+                <br>
+                <br>
+                <div class="sheet-3colrow">
+                    <div class="sheet-col">
+                        <table class="sheet-table-center">
+                            <tr>
+                                <td colspan="4"><input type="text" name="attr_spellname416" title="@{spellname416}" class="sheet-spell" placeholder="Spell name"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Cast Today: </label></td>
+                                <td><input type="number" name="attr_cast-value416" title="@{cast-value416}" value="0" class="sheet-short"></td>
+                                <td class="sheet-centering-padding-2"><label>/</label></td>
+                                <td><input type="number" name="attr_cast-max416" title="@{cast-max416}" class="sheet-short"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Casting Time: </label></td>
+                                <td><input type="text" name="attr_casttime416" title="@{casttime416}" class="sheet-short"></td>
+                                <td></td>
+                                <td><button type="roll" style="margin: 0;" name="roll_initspell416" title="%{initspell416}" value="/gmroll [[{([[1d10]]+@{casttime416}), 1}kh1]] [Initiative (@{spellname416})]&{tracker}">Initiative</button></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><textarea name="attr_cast-macro416" title="@{cast-macro416}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><button type="roll" name="roll_spellcast416" title="%{spellcast416}" value="@{cast-macro416}">Roll Spell Effects</button></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="sheet-col">
+                        <table class="sheet-table-center">
+                            <tr>
+                                <td colspan="4"><input type="text" name="attr_spellname417" title="@{spellname417}" class="sheet-spell" placeholder="Spell name"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Cast Today: </label></td>
+                                <td><input type="number" name="attr_cast-value417" title="@{cast-value417}" value="0" class="sheet-short"></td>
+                                <td class="sheet-centering-padding-2"><label>/</label></td>
+                                <td><input type="number" name="attr_cast-max417" title="@{cast-max417}" class="sheet-short"></td>
+                            </tr>
+                            <tr>
+                                <td><label>Casting Time: </label></td>
+                                <td><input type="text" name="attr_casttime417" title="@{casttime417}" class="sheet-short"></td>
+                                <td></td>
+                                <td><button type="roll" style="margin: 0;" name="roll_initspell417" title="%{initspell417}" value="/gmroll [[{([[1d10]]+@{casttime417}), 1}kh1]] [Initiative (@{spellname417})]&{tracker}">Initiative</button></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><textarea name="attr_cast-macro417" title="@{cast-macro417}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                            </tr>
+                            <tr>
+                                <td colspan="4"><button type="roll" name="roll_spellcast417" title="%{spellcast417}" value="@{cast-macro417}">Roll Spell Effects</button></td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="sheet-col">
                         <table class="sheet-table-center">
                             <tr>
                                 <td colspan="4"><input type="text" name="attr_spellname418" title="@{spellname418}" class="sheet-spell" placeholder="Spell name"></td>
@@ -12724,31 +12736,6 @@
                                     <td colspan="4"><button type="roll" name="roll_spellcast419" title="%{repeating_hench3_$X_spellcast419}" value="@{cast-macro419}">Roll Spell Effects</button></td>
                                 </tr>
                             </table>
-                            <br>
-                            <br>
-                            <table class="sheet-table-center">
-                                <tr>
-                                    <td colspan="4"><input type="text" name="attr_spellname422" title="@{repeating_hench3_$X_spellname422}" class="sheet-spell" placeholder="Spell name"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Cast Today: </label></td>
-                                    <td><input type="number" name="attr_cast-value422" title="@{repeating_hench3_$X_cast-value422}" value="0" class="sheet-short"></td>
-                                    <td class="sheet-centering-padding-2"><label>/</label></td>
-                                    <td><input type="number" name="attr_cast-max422" title="@{repeating_hench3_$X_cast-max422}" class="sheet-short"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Casting Time: </label></td>
-                                    <td><input type="text" name="attr_casttime422" title="@{repeating_hench3_$X_casttime422}" class="sheet-short"></td>
-                                    <td></td>
-                                    <td><button type="roll" style="margin: 0;" name="roll_initspell422" title="%{repeating_hench3_$X_initspell422}" value="/gmroll [[{([[1d10]]+@{casttime422}), 1}kh1]] [Initiative (@{spellname422})]&{tracker}">Initiative</button></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><textarea name="attr_cast-macro422" title="@{repeating_hench3_$X_cast-macro422}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><button type="roll" name="roll_spellcast422" title="%{repeating_hench3_$X_spellcast422}" value="@{cast-macro422}">Roll Spell Effects</button></td>
-                                </tr>
-                            </table>
                         </div>
                         <div class="sheet-col">
                             <table class="sheet-table-center">
@@ -12774,31 +12761,6 @@
                                     <td colspan="4"><button type="roll" name="roll_spellcast420" title="%{repeating_hench3_$X_spellcast420}" value="@{cast-macro420}">Roll Spell Effects</button></td>
                                 </tr>
                             </table>
-                            <br>
-                            <br>
-                            <table class="sheet-table-center">
-                                <tr>
-                                    <td colspan="4"><input type="text" name="attr_spellname423" title="@{repeating_hench3_$X_spellname423}" class="sheet-spell" placeholder="Spell name"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Cast Today: </label></td>
-                                    <td><input type="number" name="attr_cast-value423" title="@{repeating_hench3_$X_cast-value423}" value="0" class="sheet-short"></td>
-                                    <td class="sheet-centering-padding-2"><label>/</label></td>
-                                    <td><input type="number" name="attr_cast-max423" title="@{repeating_hench3_$X_cast-max423}" class="sheet-short"></td>
-                                </tr>
-                                <tr>
-                                    <td><label>Casting Time: </label></td>
-                                    <td><input type="text" name="attr_casttime423" title="@{repeating_hench3_$X_casttime423}" class="sheet-short"></td>
-                                    <td></td>
-                                    <td><button type="roll" style="margin: 0;" name="roll_initspell423" title="%{repeating_hench3_$X_initspell423}" value="/gmroll [[{([[1d10]]+@{casttime423}), 1}kh1]] [Initiative (@{spellname423})]&{tracker}">Initiative</button></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><textarea name="attr_cast-macro423" title="@{repeating_hench3_$X_cast-macro423}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4"><button type="roll" name="roll_spellcast423" title="%{repeating_hench3_$X_spellcast423}" value="@{cast-macro423}">Roll Spell Effects</button></td>
-                                </tr>
-                            </table>
                         </div>
                         <div class="sheet-col">
                             <table class="sheet-table-center">
@@ -12824,8 +12786,62 @@
                                     <td colspan="4"><button type="roll" name="roll_spellcast421" title="%{repeating_hench3_$X_spellcast421}" value="@{cast-macro421}">Roll Spell Effects</button></td>
                                 </tr>
                             </table>
-                            <br>
-                            <br>
+                        </div>
+                    </div>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname422" title="@{repeating_hench3_$X_spellname422}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value422" title="@{repeating_hench3_$X_cast-value422}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max422" title="@{repeating_hench3_$X_cast-max422}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime422" title="@{repeating_hench3_$X_casttime422}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell422" title="%{repeating_hench3_$X_initspell422}" value="/gmroll [[{([[1d10]]+@{casttime422}), 1}kh1]] [Initiative (@{spellname422})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro422" title="@{repeating_hench3_$X_cast-macro422}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast422" title="%{repeating_hench3_$X_spellcast422}" value="@{cast-macro422}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname423" title="@{repeating_hench3_$X_spellname423}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value423" title="@{repeating_hench3_$X_cast-value423}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max423" title="@{repeating_hench3_$X_cast-max423}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime423" title="@{repeating_hench3_$X_casttime423}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell423" title="%{repeating_hench3_$X_initspell423}" value="/gmroll [[{([[1d10]]+@{casttime423}), 1}kh1]] [Initiative (@{spellname423})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro423" title="@{repeating_hench3_$X_cast-macro423}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast423" title="%{repeating_hench3_$X_spellcast423}" value="@{cast-macro423}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
                             <table class="sheet-table-center">
                                 <tr>
                                     <td colspan="4"><input type="text" name="attr_spellname424" title="@{repeating_hench3_$X_spellname424}" class="sheet-spell" placeholder="Spell name"></td>
@@ -16396,10 +16412,10 @@
                 </fieldset>
             </div>
 
-            <div class="sheet-tab-content sheet-section-follower-animals"><br>
-                <br><h4><b>Animal Familiars, Followers and Beasts of Burden</b></h4><br><br><h4><b>Familiar</b></h4><br>
+            <div class="sheet-tab-content sheet-section-follower-animals">
+                <h4>Pets, Mounts, Animal Familiars, Followers and Beasts of Burden</h4>
+                <br>
                 <table>
-
                     <tr>
                         <td class="sheet-default-header">Name</td>
                         <td class="sheet-default-header">AC</td>
@@ -16410,17 +16426,14 @@
                     <tr>
                         <td><input type="text" name="attr_henchname6" title="@{henchname6}"></td>
                         <td><input type="text" name="attr_henchac6" title="@{henchac6}" class="sheet-short"></td>
-                        <td><input type="text" name="attr_henchrace6" title="@{henchrace6}" list="races"></td>
+                        <td><input type="text" name="attr_henchrace6" title="@{henchrace6}"></td>
                         <td><input type="text" name="attr_henchlvl6" title="@{henchlvl6}" class="sheet-short"></td>
                         <td><input type="text" name="attr_henchhp6" title="@{henchhp6}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp6_max" title="@{henchhp6_max}" class="sheet-small"/></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Weapons</b></h4><br>
+                <h4>Weapons / Attacks</h4>
                 <table>
-
                     <tr>
                         <td class="sheet-default-header">Weapon Name</td>
                         <td class="sheet-default-header"># of<br>Strikes</td>
@@ -16474,9 +16487,7 @@
                         <td><input type="text" name="attr_weapspeedhench032" title="@{weapspeedhench032}" class="sheet-small"><button type="roll" name="roll_inithench032" title="%{inithench032}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench032})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname6} Initiative (@{weaponnamehench032})]&{tracker}"></button></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
                         <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/gmroll [[d20+?{Misc Modifier?|0}]] &GreaterEqual; [[@{hench6partar}]] [@{henchname6} Save versus Paralyzation]"><br>Para<br>Save</button></td>
@@ -16503,285 +16514,326 @@
                         <td><input type="text" name="attr_hench6spetar" title="@{hench6spetar}" class="sheet-small"></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Familiar Spells/Powers</b></h4><br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <h4><b>Spells Memorized</b></h4>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname425" title="@{spellname425}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value425" title="@{cast-value425}" value="0" class="sheet-short"><label>/</label><input type="number" name="attr_cast-max425" title="@{cast-max425}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime425" title="@{casttime425}" class="sheet-short"><button type="roll" name="roll_initspell425" title="@{initspell425}" value="/gmroll [[{([[1d10]]+@{casttime425}), 1}kh1]] [Initiative (@{spellname425})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro425" title="@{cast-macro425}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast425" title="%{spellcast425}" value="@{cast-macro425}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                <details>
+                    <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
+                    <div class="sheet-3colrow">
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname425" title="@{spellname425}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value425" title="@{cast-value425}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max425" title="@{cast-max425}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime425" title="@{casttime425}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell425" title="%{initspell425}" value="/gmroll [[{([[1d10]]+@{casttime425}), 1}kh1]] [Initiative (@{spellname425})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro425" title="@{cast-macro425}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast425" title="%{spellcast425}" value="@{cast-macro425}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname426" title="@{spellname426}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value426" title="@{cast-value426}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max426" title="@{cast-max426}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime426" title="@{casttime426}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell426" title="%{initspell426}" value="/gmroll [[{([[1d10]]+@{casttime426}), 1}kh1]] [Initiative (@{spellname426})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro426" title="@{cast-macro426}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast426" title="%{spellcast426}" value="@{cast-macro426}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname427" title="@{spellname427}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value427" title="@{cast-value427}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max427" title="@{cast-max427}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime427" title="@{casttime427}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell427" title="%{initspell427}" value="/gmroll [[{([[1d10]]+@{casttime427}), 1}kh1]] [Initiative (@{spellname427})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro427" title="@{cast-macro427}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast427" title="%{spellcast427}" value="@{cast-macro427}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
                     </div>
-                    <div class="sheet-col">
-                        <h4><b>Spells Memorized</b></h4>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname426" title="@{spellname426}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value426" title="@{cast-value426}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max426" title="@{cast-max426}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime426" title="@{casttime426}" class="sheet-short"><button type="roll" name="roll_initspell426" title="@{initspell426}" value="/gmroll [[{([[1d10]]+@{casttime426}), 1}kh1]] [Initiative (@{spellname426})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro426" title="@{cast-macro426}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast426" title="%{spellcast426}" value="@{cast-macro426}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname428" title="@{spellname428}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value428" title="@{cast-value428}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max428" title="@{cast-max428}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime428" title="@{casttime428}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell428" title="%{initspell428}" value="/gmroll [[{([[1d10]]+@{casttime428}), 1}kh1]] [Initiative (@{spellname428})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro428" title="@{cast-macro428}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast428" title="%{spellcast428}" value="@{cast-macro428}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname429" title="@{spellname429}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value429" title="@{cast-value429}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max429" title="@{cast-max429}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime429" title="@{casttime429}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell429" title="%{initspell429}" value="/gmroll [[{([[1d10]]+@{casttime429}), 1}kh1]] [Initiative (@{spellname429})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro429" title="@{cast-macro429}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast429" title="%{spellcast429}" value="@{cast-macro429}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname430" title="@{spellname430}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value430" title="@{cast-value430}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max430" title="@{cast-max430}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime430" title="@{casttime430}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell430" title="%{initspell430}" value="/gmroll [[{([[1d10]]+@{casttime430}), 1}kh1]] [Initiative (@{spellname430})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro430" title="@{cast-macro430}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast430" title="%{spellcast430}" value="@{cast-macro430}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
                     </div>
-                    <div class="sheet-col">
-                        <h4><b>Spells Memorized</b></h4>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname427" title="@{spellname427}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value427" title="@{cast-value427}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max427" title="@{cast-max427}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime427" title="@{casttime427}" class="sheet-short"><button type="roll" name="roll_initspell427" title="@{initspell427}" value="/gmroll [[{([[1d10]]+@{casttime427}), 1}kh1]] [Initiative (@{spellname427})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro427" title="@{cast-macro427}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast427" title="%{spellcast427}" value="@{cast-macro427}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname431" title="@{spellname431}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value431" title="@{cast-value431}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max431" title="@{cast-max431}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime431" title="@{casttime431}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell431" title="%{initspell431}" value="/gmroll [[{([[1d10]]+@{casttime431}), 1}kh1]] [Initiative (@{spellname431})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro431" title="@{cast-macro431}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast431" title="%{spellcast431}" value="@{cast-macro431}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname432" title="@{spellname432}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value432" title="@{cast-value432}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max432" title="@{cast-max432}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime432" title="@{casttime432}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell432" title="%{initspell432}" value="/gmroll [[{([[1d10]]+@{casttime432}), 1}kh1]] [Initiative (@{spellname432})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro432" title="@{cast-macro432}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast432" title="%{spellcast432}" value="@{cast-macro432}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname433" title="@{spellname433}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value433" title="@{cast-value433}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max433" title="@{cast-max433}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime433" title="@{casttime433}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell433" title="%{initspell433}" value="/gmroll [[{([[1d10]]+@{casttime433}), 1}kh1]] [Initiative (@{spellname433})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro433" title="@{cast-macro433}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast433" title="%{spellcast433}" value="@{cast-macro433}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
                     </div>
-                </div>
-                <br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname428" title="@{spellname428}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value428" title="@{cast-value428}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max428" title="@{cast-max428}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime428" title="@{casttime428}" class="sheet-short"><button type="roll" name="roll_initspell428" title="@{initspell428}" value="/gmroll [[{([[1d10]]+@{casttime428}), 1}kh1]] [Initiative (@{spellname428})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro428" title="@{cast-macro428}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast428" title="%{spellcast428}" value="@{cast-macro428}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname434" title="@{spellname434}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value434" title="@{cast-value434}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max434" title="@{cast-max434}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime434" title="@{casttime434}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell434" title="%{initspell434}" value="/gmroll [[{([[1d10]]+@{casttime434}), 1}kh1]] [Initiative (@{spellname434})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro434" title="@{cast-macro434}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast434" title="%{spellcast434}" value="@{cast-macro434}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname435" title="@{spellname435}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value435" title="@{cast-value435}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max435" title="@{cast-max435}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime435" title="@{casttime435}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell435" title="%{initspell435}" value="/gmroll [[{([[1d10]]+@{casttime435}), 1}kh1]] [Initiative (@{spellname435})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro435" title="@{cast-macro435}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast435" title="%{spellcast435}" value="@{cast-macro435}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div class="sheet-col">
+                            <table class="sheet-table-center">
+                                <tr>
+                                    <td colspan="4"><input type="text" name="attr_spellname436" title="@{spellname436}" class="sheet-spell" placeholder="Spell name"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Cast Today: </label></td>
+                                    <td><input type="number" name="attr_cast-value436" title="@{cast-value436}" value="0" class="sheet-short"></td>
+                                    <td class="sheet-centering-padding-2"><label>/</label></td>
+                                    <td><input type="number" name="attr_cast-max436" title="@{cast-max436}" class="sheet-short"></td>
+                                </tr>
+                                <tr>
+                                    <td><label>Casting Time: </label></td>
+                                    <td><input type="text" name="attr_casttime436" title="@{casttime436}" class="sheet-short"></td>
+                                    <td></td>
+                                    <td><button type="roll" style="margin: 0;" name="roll_initspell436" title="%{initspell436}" value="/gmroll [[{([[1d10]]+@{casttime436}), 1}kh1]] [Initiative (@{spellname436})]&{tracker}">Initiative</button></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><textarea name="attr_cast-macro436" title="@{cast-macro436}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                </tr>
+                                <tr>
+                                    <td colspan="4"><button type="roll" name="roll_spellcast436" title="%{spellcast436}" value="@{cast-macro436}">Roll Spell Effects</button></td>
+                                </tr>
+                            </table>
+                        </div>
                     </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname429" title="@{spellname429}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value429" title="@{cast-value429}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max429" title="@{cast-max429}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime429" title="@{casttime429}" class="sheet-short"><button type="roll" name="roll_initspell429" title="@{initspell429}" value="/gmroll [[{([[1d10]]+@{casttime429}), 1}kh1]] [Initiative (@{spellname429})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro429" title="@{cast-macro429}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast429" title="@{spellcast429}" value="@{cast-macro429}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname430" title="@{spellname430}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value430" title="@{cast-value430}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max430" title="@{cast-max430}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime430" title="@{casttime430}" class="sheet-short"><button type="roll" name="roll_initspell430" title="@{initspell430}" value="/gmroll [[{([[1d10]]+@{casttime424}), 1}kh1]] [Initiative (@{spellname424})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro430" title="@{cast-macro430}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast430" title="%{spellcast430}" value="@{cast-macro430}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname431" title="@{spellname431}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value431" title="@{cast-value431}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max431" title="@{cast-max431}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime431" title="@{casttime431}" class="sheet-short"><button type="roll" name="roll_initspell431" title="@{initspell431}" value="/gmroll [[{([[1d10]]+@{casttime431}), 1}kh1]] [Initiative (@{spellname431})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro431" title="@{cast-macro431}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast431" title="%{spellcast431}" value="@{cast-macro431}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname432" title="@{spellname432}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value432" title="@{cast-value432}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max432" title="@{cast-max432}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime432" title="@{casttime432}" class="sheet-short"><button type="roll" name="roll_initspell432" title="@{initspell432}" value="/gmroll [[{([[1d10]]+@{casttime432}), 1}kh1]] [Initiative (@{spellname432})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro432" title="@{cast-macro432}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast432" title="%{spellcast432}" value="@{cast-macro432}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname433" title="@{spellname433}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value433" title="@{cast-value433}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max433" title="@{cast-max433}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime433" title="@{casttime433}" class="sheet-short"><button type="roll" name="roll_initspell433" title="@{initspell433}" value="/gmroll [[{([[1d10]]+@{casttime433}), 1}kh1]] [Initiative (@{spellname433})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro433" title="@{cast-macro433}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast433" title="%{spellcast433}" value="@{cast-macro433}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname434" title="@{spellname434}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value434" title="@{cast-value434}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max434" title="@{cast-max434}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime434" title="@{casttime434}" class="sheet-short"><button type="roll" name="roll_initspell434" title="@{initspell434}" value="/gmroll [[{([[1d10]]+@{casttime434}), 1}kh1]] [Initiative (@{spellname434})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro434" title="@{cast-macro434}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast434" title="%{spellcast434}" value="@{cast-macro434}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname435" title="@{spellname435}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value435" title="@{cast-value435}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max435" title="@{cast-max435}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime435" title="@{casttime435}" class="sheet-short"><button type="roll" name="roll_initspell435" title="@{initspell435}" value="/gmroll [[{([[1d10]]+@{casttime435}), 1}kh1]] [Initiative (@{spellname435})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro435" title="@{cast-macro435}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast435" title="%{spellcast435}" value="@{cast-macro435}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname436" title="@{spellname436}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value436" title="@{cast-value436}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max436" title="@{cast-max436}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime436" title="@{casttime436}" class="sheet-short"><button type="roll" name="roll_initspell436" title="@{initspell436}" value="/gmroll [[{([[1d10]]+@{casttime436}), 1}kh1]] [Initiative (@{spellname436})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro436" title="@{cast-macro436}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast436" title="%{spellcast436}" value="@{cast-macro436}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-                <br>
+                </details>
                 <hr>
-                <h4><b>Traits and Tricks</b></h4><br>
+                <h4>Traits and Tricks</h4>
                 <div class="sheet-3colrow">
                     <div class="sheet-col">
                         <table>
@@ -16841,9 +16893,8 @@
                         </table>
                     </div>
                 </div>
-                <br>
                 <hr>
-                <h4><b>Gear</b></h4><br>
+                <h4>Gear</h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -16923,7 +16974,10 @@
                         <td><input type="text" name="attr_gearlochench109" title="@{gearlochench109}" placeholder="Location"></td>
                     </tr>
                 </table>
-                <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea6" title="@{henchnotesarea6}"></textarea>
+                <br>
+                <h4>Notes</h4>
+                <textarea name="attr_henchnotesarea6" title="@{henchnotesarea6}"></textarea>
+                <hr>
                 <hr>
                 <fieldset name="repeating_hench6" class="repeating_hench6">
                     <table>
@@ -16938,15 +16992,14 @@
                         <tr>
                             <td><input type="text" name="attr_henchname66" title="@{repeating_hench6_$X_henchname66}"></td>
                             <td><input type="text" name="attr_henchac66" title="@{repeating_hench6_$X_henchac66}" class="sheet-short"></td>
-                            <td><input type="text" name="attr_henchrace66" title="@{repeating_hench6_$X_henchrace66}" list="races"></td>
+                            <td><input type="text" name="attr_henchrace66" title="@{repeating_hench6_$X_henchrace66}"></td>
                             <td><input type="text" name="attr_henchlvl66" title="@{repeating_hench6_$X_henchlvl66}" class="sheet-short"></td>
-                            <td><input type="text" name="attr_henchhp66" title="@{repeating_hench6_$X_henchhp66}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp66_max" title="@{henchhp66_max}" class="sheet-small"/></td>
+                            <td><input type="text" name="attr_henchhp66" title="@{repeating_hench6_$X_henchhp66}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp66_max" title="@{henchhp66_max}" class="sheet-small"/></td>
                             <td><input type="text" name="attr_henchunits66" title="@{repeating_hench6_$X_henchunits66}" class="sheet-small" placeholder="#"></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br><h4><b>Weapons</b></h4><br>
+                    <h4>Weapons / Attacks</h4>
                     <table>
                         <tr>
                             <td class="sheet-default-header">Weapon Name</td>
@@ -17001,7 +17054,6 @@
                             <td><input type="text" name="attr_weapspeedhench035" title="@{repeating_hench6_$X_weapspeedhench035}" class="sheet-small"><button type="roll" name="roll_inithench035" title="%{repeating_hench5_$X_inithench035}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench035})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname66} Initiative (@{weaponnamehench035})]&{tracker}"></button></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
@@ -17029,10 +17081,326 @@
                             <td><input type="text" name="attr_hench66spetar" title="@{repeating_hench6_$X_hench66spetar}" class="sheet-small"></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br>
-                    <h4><b>Traits and Tricks</b></h4><br>
+                    <details>
+                        <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
+                        <div class="sheet-3colrow">
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname437" title="@{repeating_hench6_$X_spellname437}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value437" title="@{repeating_hench6_$X_cast-value437}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max437" title="@{repeating_hench6_$X_cast-max437}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime437" title="@{repeating_hench6_$X_casttime437}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell437" title="%{repeating_hench6_$X_initspell437}" value="/gmroll [[{([[1d10]]+@{casttime437}), 1}kh1]] [Initiative (@{spellname437})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro437" title="@{repeating_hench6_$X_cast-macro437}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast437" title="%{repeating_hench6_$X_spellcast437}" value="@{cast-macro437}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname438" title="@{repeating_hench6_$X_spellname438}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value438" title="@{repeating_hench6_$X_cast-value438}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max438" title="@{repeating_hench6_$X_cast-max438}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime438" title="@{repeating_hench6_$X_casttime438}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell438" title="%{repeating_hench6_$X_initspell438}" value="/gmroll [[{([[1d10]]+@{casttime438}), 1}kh1]] [Initiative (@{spellname438})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro438" title="@{repeating_hench6_$X_cast-macro438}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast438" title="%{repeating_hench6_$X_spellcast438}" value="@{cast-macro438}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname439" title="@{repeating_hench6_$X_spellname439}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value439" title="@{repeating_hench6_$X_cast-value439}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max439" title="@{repeating_hench6_$X_cast-max439}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime439" title="@{repeating_hench6_$X_casttime439}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell439" title="%{repeating_hench6_$X_initspell439}" value="/gmroll [[{([[1d10]]+@{casttime439}), 1}kh1]] [Initiative (@{spellname439})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro439" title="@{repeating_hench6_$X_cast-macro439}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast439" title="%{repeating_hench6_$X_spellcast439}" value="@{cast-macro439}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                        <br>
+                        <br>
+                        <div class="sheet-3colrow">
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname440" title="@{repeating_hench6_$X_spellname440}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value440" title="@{repeating_hench6_$X_cast-value440}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max440" title="@{repeating_hench6_$X_cast-max440}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime440" title="@{repeating_hench6_$X_casttime440}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell440" title="%{repeating_hench6_$X_initspell440}" value="/gmroll [[{([[1d10]]+@{casttime440}), 1}kh1]] [Initiative (@{spellname440})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro440" title="@{repeating_hench6_$X_cast-macro440}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast440" title="%{repeating_hench6_$X_spellcast440}" value="@{cast-macro440}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname441" title="@{repeating_hench6_$X_spellname441}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value441" title="@{repeating_hench6_$X_cast-value441}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max441" title="@{repeating_hench6_$X_cast-max441}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime441" title="@{repeating_hench6_$X_casttime441}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell441" title="%{repeating_hench6_$X_initspell441}" value="/gmroll [[{([[1d10]]+@{casttime441}), 1}kh1]] [Initiative (@{spellname441})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro441" title="@{repeating_hench6_$X_cast-macro441}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast441" title="%{repeating_hench6_$X_spellcast441}" value="@{cast-macro441}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname442" title="@{repeating_hench6_$X_spellname442}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value442" title="@{repeating_hench6_$X_cast-value442}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max442" title="@{repeating_hench6_$X_cast-max442}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime442" title="@{repeating_hench6_$X_casttime442}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell442" title="%{repeating_hench6_$X_initspell442}" value="/gmroll [[{([[1d10]]+@{casttime442}), 1}kh1]] [Initiative (@{spellname442})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro442" title="@{repeating_hench6_$X_cast-macro442}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast442" title="%{repeating_hench6_$X_spellcast442}" value="@{cast-macro442}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                        <br>
+                        <br>
+                        <div class="sheet-3colrow">
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname443" title="@{repeating_hench6_$X_spellname443}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value443" title="@{repeating_hench6_$X_cast-value443}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max443" title="@{repeating_hench6_$X_cast-max443}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime443" title="@{repeating_hench6_$X_casttime443}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell443" title="%{repeating_hench6_$X_initspell443}" value="/gmroll [[{([[1d10]]+@{casttime443}), 1}kh1]] [Initiative (@{spellname443})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro443" title="@{repeating_hench6_$X_cast-macro443}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast443" title="%{repeating_hench6_$X_spellcast443}" value="@{cast-macro443}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname444" title="@{repeating_hench6_$X_spellname444}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value444" title="@{repeating_hench6_$X_cast-value444}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max444" title="@{repeating_hench6_$X_cast-max444}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime444" title="@{repeating_hench6_$X_casttime444}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell444" title="%{repeating_hench6_$X_initspell444}" value="/gmroll [[{([[1d10]]+@{casttime444}), 1}kh1]] [Initiative (@{spellname444})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro444" title="@{repeating_hench6_$X_cast-macro444}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast444" title="%{repeating_hench6_$X_spellcast444}" value="@{cast-macro444}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname445" title="@{repeating_hench6_$X_spellname445}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value445" title="@{repeating_hench6_$X_cast-value445}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max445" title="@{repeating_hench6_$X_cast-max445}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime445" title="@{repeating_hench6_$X_casttime445}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell445" title="%{repeating_hench6_$X_initspell445}" value="/gmroll [[{([[1d10]]+@{casttime445}), 1}kh1]] [Initiative (@{spellname445})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro445" title="@{repeating_hench6_$X_cast-macro445}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast445" title="%{repeating_hench6_$X_spellcast445}" value="@{cast-macro445}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                        <br>
+                        <br>
+                        <div class="sheet-3colrow">
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname446" title="@{repeating_hench6_$X_spellname446}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value446" title="@{repeating_hench6_$X_cast-value446}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max446" title="@{repeating_hench6_$X_cast-max446}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime446" title="@{repeating_hench6_$X_casttime446}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell446" title="%{repeating_hench6_$X_initspell446}" value="/gmroll [[{([[1d10]]+@{casttime446}), 1}kh1]] [Initiative (@{spellname446})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro446" title="@{repeating_hench6_$X_cast-macro446}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast446" title="%{repeating_hench6_$X_spellcast446}" value="@{cast-macro446}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname447" title="@{repeating_hench6_$X_spellname447}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value447" title="@{repeating_hench6_$X_cast-value447}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max447" title="@{repeating_hench6_$X_cast-max447}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime447" title="@{repeating_hench6_$X_casttime447}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell447" title="%{repeating_hench6_$X_initspell447}" value="/gmroll [[{([[1d10]]+@{casttime447}), 1}kh1]] [Initiative (@{spellname447})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro447" title="@{repeating_hench6_$X_cast-macro447}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast447" title="%{repeating_hench6_$X_spellcast447}" value="@{cast-macro447}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="sheet-col">
+                                <table class="sheet-table-center">
+                                    <tr>
+                                        <td colspan="4"><input type="text" name="attr_spellname448" title="@{repeating_hench6_$X_spellname448}" class="sheet-spell" placeholder="Spell name"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Cast Today: </label></td>
+                                        <td><input type="number" name="attr_cast-value448" title="@{repeating_hench6_$X_cast-value448}" value="0" class="sheet-short"></td>
+                                        <td class="sheet-centering-padding-2"><label>/</label></td>
+                                        <td><input type="number" name="attr_cast-max448" title="@{repeating_hench6_$X_cast-max448}" class="sheet-short"></td>
+                                    </tr>
+                                    <tr>
+                                        <td><label>Casting Time: </label></td>
+                                        <td><input type="text" name="attr_casttime448" title="@{repeating_hench6_$X_casttime448}" class="sheet-short"></td>
+                                        <td></td>
+                                        <td><button type="roll" style="margin: 0;" name="roll_initspell448" title="%{repeating_hench6_$X_initspell448}" value="/gmroll [[{([[1d10]]+@{casttime448}), 1}kh1]] [Initiative (@{spellname448})]&{tracker}">Initiative</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><textarea name="attr_cast-macro448" title="@{repeating_hench6_$X_cast-macro448}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="4"><button type="roll" name="roll_spellcast448" title="%{repeating_hench6_$X_spellcast448}" value="@{cast-macro448}">Roll Spell Effects</button></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </details>
+                    <hr>
+                    <h4>Traits and Tricks</h4>
                     <div class="sheet-3colrow">
                         <div class="sheet-col">
                             <table>
@@ -17092,9 +17460,8 @@
                             </table>
                         </div>
                     </div>
-                    <br>
                     <hr>
-                    <br><h4><b>Gear</b></h4><br>
+                    <h4>Gear</h4>
                     <table>
                         <tr>
                             <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -17174,7 +17541,10 @@
                             <td><input type="text" name="attr_gearlochench119" title="@{repeating_hench6_$X_gearlochench119}" placeholder="Location"></td>
                         </tr>
                     </table>
-                    <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea66" title="@{repeating_hench5_$X_henchnotesarea66}"></textarea>
+                    <br>
+                    <h4>Notes</h4>
+                    <textarea name="attr_henchnotesarea66" title="@{repeating_hench5_$X_henchnotesarea66}"></textarea>
+                    <hr>
                     <hr>
                 </fieldset>
             </div>
diff --git a/ADnD 2E Revised/html/2ESheet-base.html b/ADnD 2E Revised/html/2ESheet-base.html
index e764fc6e67..bd7109cb78 100644
--- a/ADnD 2E Revised/html/2ESheet-base.html	
+++ b/ADnD 2E Revised/html/2ESheet-base.html	
@@ -7558,24 +7558,16 @@
                 <h4>Wizard Spells</h4>
                 <br>
                 <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        insert_henchmen-spells.html_401
-                        <br>
-                        <br>
-                        insert_henchmen-spells.html_404
-                    </div>
-                    <div class="sheet-col">
-                        insert_henchmen-spells.html_402
-                        <br>
-                        <br>
-                        insert_henchmen-spells.html_405
-                    </div>
-                    <div class="sheet-col">
-                        insert_henchmen-spells.html_403
-                        <br>
-                        <br>
-                        insert_henchmen-spells.html_406
-                    </div>
+                    insert_henchmen-spells.html_401
+                    insert_henchmen-spells.html_402
+                    insert_henchmen-spells.html_403
+                </div>
+                <br>
+                <br>
+                <div class="sheet-3colrow">
+                    insert_henchmen-spells.html_404
+                    insert_henchmen-spells.html_405
+                    insert_henchmen-spells.html_406
                 </div>
                 <hr>
                 <h4>Gear</h4>
@@ -7771,24 +7763,16 @@
                     <h4>Wizard Spells</h4>
                     <br>
                     <div class="sheet-3colrow">
-                        <div class="sheet-col">
-                            insert_henchmen-spells.html_407_repeating-hench2-$X-
-                            <br>
-                            <br>
-                            insert_henchmen-spells.html_410_repeating-hench2-$X-
-                        </div>
-                        <div class="sheet-col">
-                            insert_henchmen-spells.html_408_repeating-hench2-$X-
-                            <br>
-                            <br>
-                            insert_henchmen-spells.html_411_repeating-hench2-$X-
-                        </div>
-                        <div class="sheet-col">
-                            insert_henchmen-spells.html_409_repeating-hench2-$X-
-                            <br>
-                            <br>
-                            insert_henchmen-spells.html_412_repeating-hench2-$X-
-                        </div>
+                        insert_henchmen-spells.html_407_repeating-hench2-$X-
+                        insert_henchmen-spells.html_408_repeating-hench2-$X-
+                        insert_henchmen-spells.html_409_repeating-hench2-$X-
+                    </div>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        insert_henchmen-spells.html_410_repeating-hench2-$X-
+                        insert_henchmen-spells.html_411_repeating-hench2-$X-
+                        insert_henchmen-spells.html_412_repeating-hench2-$X-
                     </div>
                     <hr>
                     <h4>Gear</h4>
@@ -7989,24 +7973,16 @@
                 <h4>Priest Spells</h4>
                 <br>
                 <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        insert_henchmen-spells.html_413
-                        <br>
-                        <br>
-                        insert_henchmen-spells.html_416
-                    </div>
-                    <div class="sheet-col">
-                        insert_henchmen-spells.html_414
-                        <br>
-                        <br>
-                        insert_henchmen-spells.html_417
-                    </div>
-                    <div class="sheet-col">
-                        insert_henchmen-spells.html_415
-                        <br>
-                        <br>
-                        insert_henchmen-spells.html_418
-                    </div>
+                    insert_henchmen-spells.html_413
+                    insert_henchmen-spells.html_414
+                    insert_henchmen-spells.html_415
+                </div>
+                <br>
+                <br>
+                <div class="sheet-3colrow">
+                    insert_henchmen-spells.html_416
+                    insert_henchmen-spells.html_417
+                    insert_henchmen-spells.html_418
                 </div>
                 <hr>
                 <h4>Gear</h4>
@@ -8202,24 +8178,16 @@
                     <h4>Priest Spells</h4>
                     <br>
                     <div class="sheet-3colrow">
-                        <div class="sheet-col">
-                            insert_henchmen-spells.html_419_repeating-hench3-$X-
-                            <br>
-                            <br>
-                            insert_henchmen-spells.html_422_repeating-hench3-$X-
-                        </div>
-                        <div class="sheet-col">
-                            insert_henchmen-spells.html_420_repeating-hench3-$X-
-                            <br>
-                            <br>
-                            insert_henchmen-spells.html_423_repeating-hench3-$X-
-                        </div>
-                        <div class="sheet-col">
-                            insert_henchmen-spells.html_421_repeating-hench3-$X-
-                            <br>
-                            <br>
-                            insert_henchmen-spells.html_424_repeating-hench3-$X-
-                        </div>
+                        insert_henchmen-spells.html_419_repeating-hench3-$X-
+                        insert_henchmen-spells.html_420_repeating-hench3-$X-
+                        insert_henchmen-spells.html_421_repeating-hench3-$X-
+                    </div>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        insert_henchmen-spells.html_422_repeating-hench3-$X-
+                        insert_henchmen-spells.html_423_repeating-hench3-$X-
+                        insert_henchmen-spells.html_424_repeating-hench3-$X-
                     </div>
                     <hr>
                     <h4>Gear</h4>
@@ -11766,10 +11734,10 @@
                 </fieldset>
             </div>
 
-            <div class="sheet-tab-content sheet-section-follower-animals"><br>
-                <br><h4><b>Animal Familiars, Followers and Beasts of Burden</b></h4><br><br><h4><b>Familiar</b></h4><br>
+            <div class="sheet-tab-content sheet-section-follower-animals">
+                <h4>Pets, Mounts, Animal Familiars, Followers and Beasts of Burden</h4>
+                <br>
                 <table>
-
                     <tr>
                         <td class="sheet-default-header">Name</td>
                         <td class="sheet-default-header">AC</td>
@@ -11780,17 +11748,14 @@
                     <tr>
                         <td><input type="text" name="attr_henchname6" title="@{henchname6}"></td>
                         <td><input type="text" name="attr_henchac6" title="@{henchac6}" class="sheet-short"></td>
-                        <td><input type="text" name="attr_henchrace6" title="@{henchrace6}" list="races"></td>
+                        <td><input type="text" name="attr_henchrace6" title="@{henchrace6}"></td>
                         <td><input type="text" name="attr_henchlvl6" title="@{henchlvl6}" class="sheet-short"></td>
                         <td><input type="text" name="attr_henchhp6" title="@{henchhp6}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp6_max" title="@{henchhp6_max}" class="sheet-small"/></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Weapons</b></h4><br>
+                <h4>Weapons / Attacks</h4>
                 <table>
-
                     <tr>
                         <td class="sheet-default-header">Weapon Name</td>
                         <td class="sheet-default-header"># of<br>Strikes</td>
@@ -11844,9 +11809,7 @@
                         <td><input type="text" name="attr_weapspeedhench032" title="@{weapspeedhench032}" class="sheet-small"><button type="roll" name="roll_inithench032" title="%{inithench032}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench032})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname6} Initiative (@{weaponnamehench032})]&{tracker}"></button></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
                 <table class="sheet-centering" style="width: 100%;">
                     <tr>
                         <td><button type="roll" name="roll_hench6parsave" title="%{hench6parsave}" value="/gmroll [[d20+?{Misc Modifier?|0}]] &GreaterEqual; [[@{hench6partar}]] [@{henchname6} Save versus Paralyzation]"><br>Para<br>Save</button></td>
@@ -11873,285 +11836,38 @@
                         <td><input type="text" name="attr_hench6spetar" title="@{hench6spetar}" class="sheet-small"></td>
                     </tr>
                 </table>
-                <br>
                 <hr>
-                <br>
-                <h4><b>Familiar Spells/Powers</b></h4><br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <h4><b>Spells Memorized</b></h4>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname425" title="@{spellname425}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value425" title="@{cast-value425}" value="0" class="sheet-short"><label>/</label><input type="number" name="attr_cast-max425" title="@{cast-max425}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime425" title="@{casttime425}" class="sheet-short"><button type="roll" name="roll_initspell425" title="@{initspell425}" value="/gmroll [[{([[1d10]]+@{casttime425}), 1}kh1]] [Initiative (@{spellname425})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro425" title="@{cast-macro425}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast425" title="%{spellcast425}" value="@{cast-macro425}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                <details>
+                    <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
+                    <div class="sheet-3colrow">
+                        insert_henchmen-spells.html_425
+                        insert_henchmen-spells.html_426
+                        insert_henchmen-spells.html_427
                     </div>
-                    <div class="sheet-col">
-                        <h4><b>Spells Memorized</b></h4>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname426" title="@{spellname426}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value426" title="@{cast-value426}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max426" title="@{cast-max426}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime426" title="@{casttime426}" class="sheet-short"><button type="roll" name="roll_initspell426" title="@{initspell426}" value="/gmroll [[{([[1d10]]+@{casttime426}), 1}kh1]] [Initiative (@{spellname426})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro426" title="@{cast-macro426}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast426" title="%{spellcast426}" value="@{cast-macro426}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        insert_henchmen-spells.html_428
+                        insert_henchmen-spells.html_429
+                        insert_henchmen-spells.html_430
                     </div>
-                    <div class="sheet-col">
-                        <h4><b>Spells Memorized</b></h4>
-                        <br>
-                        <br>
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname427" title="@{spellname427}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value427" title="@{cast-value427}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max427" title="@{cast-max427}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime427" title="@{casttime427}" class="sheet-short"><button type="roll" name="roll_initspell427" title="@{initspell427}" value="/gmroll [[{([[1d10]]+@{casttime427}), 1}kh1]] [Initiative (@{spellname427})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro427" title="@{cast-macro427}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast427" title="%{spellcast427}" value="@{cast-macro427}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        insert_henchmen-spells.html_431
+                        insert_henchmen-spells.html_432
+                        insert_henchmen-spells.html_433
                     </div>
-                </div>
-                <br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname428" title="@{spellname428}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value428" title="@{cast-value428}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max428" title="@{cast-max428}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime428" title="@{casttime428}" class="sheet-short"><button type="roll" name="roll_initspell428" title="@{initspell428}" value="/gmroll [[{([[1d10]]+@{casttime428}), 1}kh1]] [Initiative (@{spellname428})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro428" title="@{cast-macro428}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast428" title="%{spellcast428}" value="@{cast-macro428}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
+                    <br>
+                    <br>
+                    <div class="sheet-3colrow">
+                        insert_henchmen-spells.html_434
+                        insert_henchmen-spells.html_435
+                        insert_henchmen-spells.html_436
                     </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname429" title="@{spellname429}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value429" title="@{cast-value429}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max429" title="@{cast-max429}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime429" title="@{casttime429}" class="sheet-short"><button type="roll" name="roll_initspell429" title="@{initspell429}" value="/gmroll [[{([[1d10]]+@{casttime429}), 1}kh1]] [Initiative (@{spellname429})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro429" title="@{cast-macro429}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast429" title="@{spellcast429}" value="@{cast-macro429}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname430" title="@{spellname430}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value430" title="@{cast-value430}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max430" title="@{cast-max430}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime430" title="@{casttime430}" class="sheet-short"><button type="roll" name="roll_initspell430" title="@{initspell430}" value="/gmroll [[{([[1d10]]+@{casttime424}), 1}kh1]] [Initiative (@{spellname424})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro430" title="@{cast-macro430}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast430" title="%{spellcast430}" value="@{cast-macro430}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname431" title="@{spellname431}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value431" title="@{cast-value431}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max431" title="@{cast-max431}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime431" title="@{casttime431}" class="sheet-short"><button type="roll" name="roll_initspell431" title="@{initspell431}" value="/gmroll [[{([[1d10]]+@{casttime431}), 1}kh1]] [Initiative (@{spellname431})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro431" title="@{cast-macro431}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast431" title="%{spellcast431}" value="@{cast-macro431}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname432" title="@{spellname432}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value432" title="@{cast-value432}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max432" title="@{cast-max432}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime432" title="@{casttime432}" class="sheet-short"><button type="roll" name="roll_initspell432" title="@{initspell432}" value="/gmroll [[{([[1d10]]+@{casttime432}), 1}kh1]] [Initiative (@{spellname432})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro432" title="@{cast-macro432}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast432" title="%{spellcast432}" value="@{cast-macro432}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname433" title="@{spellname433}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value433" title="@{cast-value433}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max433" title="@{cast-max433}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime433" title="@{casttime433}" class="sheet-short"><button type="roll" name="roll_initspell433" title="@{initspell433}" value="/gmroll [[{([[1d10]]+@{casttime433}), 1}kh1]] [Initiative (@{spellname433})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro433" title="@{cast-macro433}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast433" title="%{spellcast433}" value="@{cast-macro433}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-                <br>
-                <div class="sheet-3colrow">
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname434" title="@{spellname434}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value434" title="@{cast-value434}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max434" title="@{cast-max434}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime434" title="@{casttime434}" class="sheet-short"><button type="roll" name="roll_initspell434" title="@{initspell434}" value="/gmroll [[{([[1d10]]+@{casttime434}), 1}kh1]] [Initiative (@{spellname434})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro434" title="@{cast-macro434}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast434" title="%{spellcast434}" value="@{cast-macro434}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname435" title="@{spellname435}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value435" title="@{cast-value435}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max435" title="@{cast-max435}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime435" title="@{casttime435}" class="sheet-short"><button type="roll" name="roll_initspell435" title="@{initspell435}" value="/gmroll [[{([[1d10]]+@{casttime435}), 1}kh1]] [Initiative (@{spellname435})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro435" title="@{cast-macro435}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast435" title="%{spellcast435}" value="@{cast-macro435}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div class="sheet-col">
-                        <table class="sheet-table-center">
-                            <tr>
-                                <td><input type="text" name="attr_spellname436" title="@{spellname436}" class="sheet-spell" placeholder="Spell name"></td>
-                            </tr>
-                            <tr>
-                                <td><h4><b>Cast Today:&nbsp;&nbsp;&nbsp;&nbsp;</b></h4><input type="number" name="attr_cast-value436" title="@{cast-value436}" value="0" class="sheet-short"><h4><b>/</b></h4><input type="number" name="attr_cast-max436" title="@{cast-max436}" class="sheet-short"><span></span></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <h4><b>Casting Time: </b></h4><input type="text" name="attr_casttime436" title="@{casttime436}" class="sheet-short"><button type="roll" name="roll_initspell436" title="@{initspell436}" value="/gmroll [[{([[1d10]]+@{casttime436}), 1}kh1]] [Initiative (@{spellname436})]&{tracker}">Initiative</button>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td><input type="text" name="attr_cast-macro436" title="@{cast-macro436}" class="sheet-spell" placeholder="Insert Spell effects."/></td>
-                            </tr>
-                            <tr>
-                                <td><button type="roll" name="roll_spellcast436" title="%{spellcast436}" value="@{cast-macro436}">Roll Spell Effects</button></td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-                <br>
+                </details>
                 <hr>
-                <h4><b>Traits and Tricks</b></h4><br>
+                <h4>Traits and Tricks</h4>
                 <div class="sheet-3colrow">
                     <div class="sheet-col">
                         <table>
@@ -12211,9 +11927,8 @@
                         </table>
                     </div>
                 </div>
-                <br>
                 <hr>
-                <h4><b>Gear</b></h4><br>
+                <h4>Gear</h4>
                 <table>
                     <tr>
                         <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -12293,7 +12008,10 @@
                         <td><input type="text" name="attr_gearlochench109" title="@{gearlochench109}" placeholder="Location"></td>
                     </tr>
                 </table>
-                <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea6" title="@{henchnotesarea6}"></textarea>
+                <br>
+                <h4>Notes</h4>
+                <textarea name="attr_henchnotesarea6" title="@{henchnotesarea6}"></textarea>
+                <hr>
                 <hr>
                 <fieldset name="repeating_hench6" class="repeating_hench6">
                     <table>
@@ -12308,15 +12026,14 @@
                         <tr>
                             <td><input type="text" name="attr_henchname66" title="@{repeating_hench6_$X_henchname66}"></td>
                             <td><input type="text" name="attr_henchac66" title="@{repeating_hench6_$X_henchac66}" class="sheet-short"></td>
-                            <td><input type="text" name="attr_henchrace66" title="@{repeating_hench6_$X_henchrace66}" list="races"></td>
+                            <td><input type="text" name="attr_henchrace66" title="@{repeating_hench6_$X_henchrace66}"></td>
                             <td><input type="text" name="attr_henchlvl66" title="@{repeating_hench6_$X_henchlvl66}" class="sheet-short"></td>
-                            <td><input type="text" name="attr_henchhp66" title="@{repeating_hench6_$X_henchhp66}" class="sheet-small"/><h4><b>/</b></h4><input type="text" name="attr_henchhp66_max" title="@{henchhp66_max}" class="sheet-small"/></td>
+                            <td><input type="text" name="attr_henchhp66" title="@{repeating_hench6_$X_henchhp66}" class="sheet-small"/><label>/</label><input type="text" name="attr_henchhp66_max" title="@{henchhp66_max}" class="sheet-small"/></td>
                             <td><input type="text" name="attr_henchunits66" title="@{repeating_hench6_$X_henchunits66}" class="sheet-small" placeholder="#"></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br><h4><b>Weapons</b></h4><br>
+                    <h4>Weapons / Attacks</h4>
                     <table>
                         <tr>
                             <td class="sheet-default-header">Weapon Name</td>
@@ -12371,7 +12088,6 @@
                             <td><input type="text" name="attr_weapspeedhench035" title="@{repeating_hench6_$X_weapspeedhench035}" class="sheet-small"><button type="roll" name="roll_inithench035" title="%{repeating_hench5_$X_inithench035}" value="/gmroll [[{([[1d10]]+(@{weapspeedhench035})-(?{Misc. bonus|0})), 1}kh1]] [@{henchname66} Initiative (@{weaponnamehench035})]&{tracker}"></button></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
                     <table class="sheet-centering" style="width: 100%;">
                         <tr>
@@ -12399,10 +12115,38 @@
                             <td><input type="text" name="attr_hench66spetar" title="@{repeating_hench6_$X_hench66spetar}" class="sheet-small"></td>
                         </tr>
                     </table>
-                    <br>
                     <hr>
-                    <br>
-                    <h4><b>Traits and Tricks</b></h4><br>
+                    <details>
+                        <summary><h4 style="display: initial;">Familiar Spells/Powers</h4></summary>
+                        <div class="sheet-3colrow">
+                            insert_henchmen-spells.html_437_repeating-hench6-$X-
+                            insert_henchmen-spells.html_438_repeating-hench6-$X-
+                            insert_henchmen-spells.html_439_repeating-hench6-$X-
+                        </div>
+                        <br>
+                        <br>
+                        <div class="sheet-3colrow">
+                            insert_henchmen-spells.html_440_repeating-hench6-$X-
+                            insert_henchmen-spells.html_441_repeating-hench6-$X-
+                            insert_henchmen-spells.html_442_repeating-hench6-$X-
+                        </div>
+                        <br>
+                        <br>
+                        <div class="sheet-3colrow">
+                            insert_henchmen-spells.html_443_repeating-hench6-$X-
+                            insert_henchmen-spells.html_444_repeating-hench6-$X-
+                            insert_henchmen-spells.html_445_repeating-hench6-$X-
+                        </div>
+                        <br>
+                        <br>
+                        <div class="sheet-3colrow">
+                            insert_henchmen-spells.html_446_repeating-hench6-$X-
+                            insert_henchmen-spells.html_447_repeating-hench6-$X-
+                            insert_henchmen-spells.html_448_repeating-hench6-$X-
+                        </div>
+                    </details>
+                    <hr>
+                    <h4>Traits and Tricks</h4>
                     <div class="sheet-3colrow">
                         <div class="sheet-col">
                             <table>
@@ -12462,9 +12206,8 @@
                             </table>
                         </div>
                     </div>
-                    <br>
                     <hr>
-                    <br><h4><b>Gear</b></h4><br>
+                    <h4>Gear</h4>
                     <table>
                         <tr>
                             <td class="sheet-default-header" style="width:120px; text-align:left;">Description</td>
@@ -12544,7 +12287,10 @@
                             <td><input type="text" name="attr_gearlochench119" title="@{repeating_hench6_$X_gearlochench119}" placeholder="Location"></td>
                         </tr>
                     </table>
-                    <h4><b>Notes</b></h4><textarea name="attr_henchnotesarea66" title="@{repeating_hench5_$X_henchnotesarea66}"></textarea>
+                    <br>
+                    <h4>Notes</h4>
+                    <textarea name="attr_henchnotesarea66" title="@{repeating_hench5_$X_henchnotesarea66}"></textarea>
+                    <hr>
                     <hr>
                 </fieldset>
             </div>
diff --git a/ADnD 2E Revised/html/henchmen-spells.html b/ADnD 2E Revised/html/henchmen-spells.html
index b7a34056a2..195498b515 100644
--- a/ADnD 2E Revised/html/henchmen-spells.html	
+++ b/ADnD 2E Revised/html/henchmen-spells.html	
@@ -1,23 +1,25 @@
-<table class="sheet-table-center">
-    <tr>
-        <td colspan="4"><input type="text" name="attr_spellname#REPLACE0#" title="@{#REPLACE1#spellname#REPLACE0#}" class="sheet-spell" placeholder="Spell name"></td>
-    </tr>
-    <tr>
-        <td><label>Cast Today: </label></td>
-        <td><input type="number" name="attr_cast-value#REPLACE0#" title="@{#REPLACE1#cast-value#REPLACE0#}" value="0" class="sheet-short"></td>
-        <td class="sheet-centering-padding-2"><label>/</label></td>
-        <td><input type="number" name="attr_cast-max#REPLACE0#" title="@{#REPLACE1#cast-max#REPLACE0#}" class="sheet-short"></td>
-    </tr>
-    <tr>
-        <td><label>Casting Time: </label></td>
-        <td><input type="text" name="attr_casttime#REPLACE0#" title="@{#REPLACE1#casttime#REPLACE0#}" class="sheet-short"></td>
-        <td></td>
-        <td><button type="roll" style="margin: 0;" name="roll_initspell#REPLACE0#" title="%{#REPLACE1#initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
-    </tr>
-    <tr>
-        <td colspan="4"><textarea name="attr_cast-macro#REPLACE0#" title="@{#REPLACE1#cast-macro#REPLACE0#}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
-    </tr>
-    <tr>
-        <td colspan="4"><button type="roll" name="roll_spellcast#REPLACE0#" title="%{#REPLACE1#spellcast#REPLACE0#}" value="@{cast-macro#REPLACE0#}">Roll Spell Effects</button></td>
-    </tr>
-</table>
\ No newline at end of file
+<div class="sheet-col">
+    <table class="sheet-table-center">
+        <tr>
+            <td colspan="4"><input type="text" name="attr_spellname#REPLACE0#" title="@{#REPLACE1#spellname#REPLACE0#}" class="sheet-spell" placeholder="Spell name"></td>
+        </tr>
+        <tr>
+            <td><label>Cast Today: </label></td>
+            <td><input type="number" name="attr_cast-value#REPLACE0#" title="@{#REPLACE1#cast-value#REPLACE0#}" value="0" class="sheet-short"></td>
+            <td class="sheet-centering-padding-2"><label>/</label></td>
+            <td><input type="number" name="attr_cast-max#REPLACE0#" title="@{#REPLACE1#cast-max#REPLACE0#}" class="sheet-short"></td>
+        </tr>
+        <tr>
+            <td><label>Casting Time: </label></td>
+            <td><input type="text" name="attr_casttime#REPLACE0#" title="@{#REPLACE1#casttime#REPLACE0#}" class="sheet-short"></td>
+            <td></td>
+            <td><button type="roll" style="margin: 0;" name="roll_initspell#REPLACE0#" title="%{#REPLACE1#initspell#REPLACE0#}" value="/gmroll [[{([[1d10]]+@{casttime#REPLACE0#}), 1}kh1]] [Initiative (@{spellname#REPLACE0#})]&{tracker}">Initiative</button></td>
+        </tr>
+        <tr>
+            <td colspan="4"><textarea name="attr_cast-macro#REPLACE0#" title="@{#REPLACE1#cast-macro#REPLACE0#}" class="sheet-input-like" placeholder="Insert Spell effects."></textarea></td>
+        </tr>
+        <tr>
+            <td colspan="4"><button type="roll" name="roll_spellcast#REPLACE0#" title="%{#REPLACE1#spellcast#REPLACE0#}" value="@{cast-macro#REPLACE0#}">Roll Spell Effects</button></td>
+        </tr>
+    </table>
+</div>
\ No newline at end of file