diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index f65e41fb02..d627caccdc 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -258,6 +258,7 @@ div .chummercheckwrapper{
 **/
 
 .spells textarea,
+.spiritstable textarea,
 .ware textarea,
 .martial textarea,
 .qualities textarea {
@@ -421,8 +422,6 @@ input.technomancycheckbox:checked ~ div label.labeltechnomancer{
 .weaponcheckbox:checked ~ div.weaponticked,
 .contactsunticked,
 .contactscheckbox:checked ~ div.contactsticked,
-.spiritenotesunticked,
-.spiritenotescheckbox:checked ~ div.spiritenotesticked,
 .equipmentunticked,
 .equipmentcheckbox:checked ~ div.equipmentticked,
 .nuyenunticked,
@@ -517,8 +516,6 @@ input.technomancycheckbox:checked ~ div label.labeltechnomancer{
 .armorworncheckbox:checked ~ div.armorwornunticked,
 .contactsticked,
 .contactscheckbox:checked ~ div.contactsunticked,
-.spiritenotesticked,
-.spiritenotescheckbox:checked ~ div.spiritenotesunticked,
 .equipmentticked,
 .equipmentcheckbox:checked ~ div.equipmentunticked,
 .nuyenticked,
@@ -912,7 +909,6 @@ input.technomancycheckbox:checked ~ div.technomancer{
 .spells input[type=text],
 .spells select,
 .spiriterow input[type=text],
-.spiriterow textarea,
 .spiriterow select,
 .cyberdeck input[type=text],
 .charsheet .cyberdeck input[type=number],
@@ -1010,7 +1006,6 @@ input[disabled="true"]{
 .mskillrow div:not(.checkboxticker):not(.itemcontrol):not(.hiddentextfield),
 .spells div:not(.checkboxticker):not(.itemcontrol):not(.magiciandrainattribute),
 .initiationrow div:not(.itemcontrol),
-.spiriterow div:not(.itemcontrol):not(.spiritenoteswrapper):not(.technobound):not(.magebound):not(.checkboxticker),
 .contactsrow div:not(.checkboxticker):not(.contactsnoteswrapper):not(.itemcontrol),
 .programrow div:not(.checkboxticker):not(.itemcontrol),
 .vehicle div:not(.checkboxticker):not(.vehicleskillmodelabel):not(.vehicleskillswrapper):not(.vehiclenoteswrapper):not(.vehicledmgwrapper):not(.vehicleweaponnoteswrapper):not(.vehicleweaponwrapper):not(.itemcontrol),
@@ -1151,6 +1146,12 @@ input[disabled="true"]{
 .knowledgeskillnamewrapper,
 .ammodescriptionwrapper{
     width:20%;
+    display:inline-block;
+}
+
+.spiriteboundwrapper
+{
+    display:inline-block;
 }
 
 
@@ -1248,6 +1249,7 @@ input[disabled="true"]{
 .spellsourcewrapper,
 .spiriterollwrapper{
     width:8%;
+    display:inline-block;
 }
 
 
@@ -1272,6 +1274,7 @@ input[disabled="true"]{
 .ammorollwrapper,
 .ammomaxwrapper{
     width:6.5%;
+    display:inline-block;
 }
 
 .vehicleboxwrapper,
@@ -1431,10 +1434,10 @@ input[disabled="true"]{
     width:100%;
 }
 
-.spiritspacer,
 .vehiclespacer,
 .dronespacer{
     margin-right:calc(5% - 2em);
+    display:inline-block;
 }
 
 
@@ -1521,7 +1524,6 @@ input[disabled="true"]{
 .movementrow,
 .contactsrow,
 .charinforow,
-.spiriterow,
 .rollrow,
 .defenserow,
 .spellrow,
@@ -1542,6 +1544,7 @@ input[disabled="true"]{
     list-style-position: outside;
 }
 
+.spiriterow,
 .warerow,
 .martialrow,
 .qualityrow
@@ -1634,7 +1637,6 @@ input[disabled="true"]{
 .nuyennoteswrapper,
 .armornoteswrapper,
 .qualitynoteswrapper,
-.spiritenoteswrapper,
 .equipmentnoteswrapper{
     width:95%;
     padding-top:0.3em;
@@ -1669,7 +1671,6 @@ input[disabled="true"]{
 .vehiclenoteswrapper textarea,
 .dronenoteswrapper textarea,
 .qualitynoteswrapper textarea,
-.spiritenoteswrapper textarea,
 .warenoteswrapper textarea,
 .martialnoteswrapper textarea,
 .contactsnoteswrapper textarea,
@@ -1695,7 +1696,6 @@ input[disabled="true"]{
 .droneweaponnoteswrapper,
 .equipmentnoteswrapper,
 .nuyennoteswrapper,
-.spiritenoteswrapper,
 .contactsnoteswrapper,
 .armornoteswrapper,
 .weaponnoteswrapper{
@@ -1714,7 +1714,6 @@ input.dronenotescheckbox:checked ~ div.dronenoteswrapper,
 input.droneskillscheckbox:checked ~ div.droneskillswrapper,
 input.droneweaponcheckbox:checked ~ div.droneweaponnoteswrapper,
 input.armornotescheckbox:checked ~ div.armornoteswrapper,
-input.spiritenotescheckbox:checked ~ div.spiritenoteswrapper,
 input.contactscheckbox:checked ~ div.contactsnoteswrapper,
 input.equipmentcheckbox:checked ~ div.equipmentnoteswrapper,
 input.nuyencheckbox:checked ~ div.nuyennoteswrapper,
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 35f9ac2dae..9d0bff7443 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -8356,59 +8356,56 @@ make sure to enter what the spell is resisted with">
                 <div class="spiriteboundwrapper">
                     <label>Bound</label>
                 </div>
-                <div class="spiritenoteslabelwrapper">
-                    <label>Notes</label>
-                </div>
             </div>
             <fieldset class="repeating_spirites">
-                <div class="spiriterow">
-                    <div class="spiritenamewrapper">
-                        <input type="text" name="attr_spiritename" title="Name of your little Helper">
-                    </div>
-                    <div class="spiritetypewrapper" title="What Type of Spirit">
-                        <select name="attr_spirittype">
-                            <option value="@{air">Air Spirit</option>
-                            <option value="@{earth">Earth Spirit</option>
-                            <option value="@{beast">Beast Spirit</option>
-                            <option value="@{fire">Fire Spirit</option>
-                            <option value="@{man">Man Spirit</option>
-                            <option value="@{water">Water Spirit</option>
-                            <option value="@{guardian">Guardian Spirit</option>
-                            <option value="@{guidance">Guidance Spirit</option>
-                            <option value="@{plant">Plant Spirit</option>
-                            <option value="@{task">Task Spirit</option>
-                            <option value="@{ally">Ally Spirit</option>
-                        </select>
-                    </div>
-                    <div class="spiriteforcewrapper">
-                        <input type="text" name="attr_spiriteforce" title="Strength of your little Helper">
-                    </div>
-                    <div class="spiritserviceswrapper">
-                        <input type="text" name="attr_spiritservices" title="Number of Services owed">
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spriritinitiativeroll" title="Roll for Initiative with this Spirit" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{roll_name=for Initiative}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val3=Dice}}{{val3_num=[[2+?{Initiative Type|Astral,1|Physical,0}]]}}{{val2=Attributes}}{{val2_num=[[[[{@{spiriteforce}@{spirittype}_int},1}kh1]]*(1+?{Initiative Type})+[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]*(1-?{Initiative Type})]]}}{{initiative=[[[[{@{spiriteforce}@{spirittype}_int},1}kh1]]*(1+?{Initiative Type})+[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]*(1-?{Initiative Type})+(2+?{Initiative Type})d6 &{tracker}]]}}"></button>
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spirittest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Dice-Pool Part1}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{val3=Dice-Pool Part2}}{{val3_num=[[{@{Spiriteforce}?{Part 2|Skill,-0|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force x2,*2},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Force,@{spiriteforce}|Physical,ceil((@{spiriteforce}*4@{spirittype}_str}*2@{spirittype}_rea}@{spirittype}_bod})/3)|Mental,ceil((@{spiriteforce}*4@{spirittype}_log}*2@{spirittype}_int}@{spirittype}_wil})/3)|Social,ceil((@{spiriteforce}*4)/3)|Astral,ceil((@{spiriteforce}*4)/3)|Armor,(@{spiriteforce}*3+@{spirittype}_bod})}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+[[{@{spiriteforce}?{Part 2},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Limit}]]]]}}"></button>
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spiritattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spiritattributes" title="Output Attributes to Chat" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{roll_name=his stats}}{{val1=Body}}{{val1_num=[[{@{spiriteforce}@{spirittype}_bod},1}kh1]]}}{{val2=Agility}}{{val2_num=[[{@{spiriteforce}@{spirittype}_agi},1}kh1]]}}{{val3=Reaction}}{{val3_num=[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]}}{{val4=Strength}}{{val4_num=[[{@{spiriteforce}@{spirittype}_str},1}kh1]]}}{{val5=Willpower}}{{val5_num=[[{@{spiriteforce}@{spirittype}_wil},1}kh1]]}}{{val6=Logic}}{{val6_num=[[{@{spiriteforce}@{spirittype}_log},1}kh1]]}}{{val7=Intuition}}{{val7_num=[[{@{spiriteforce}@{spirittype}_int},1}kh1]]}}{{val8=Charisma}}{{val8_num=[[{@{spiriteforce}@{spirittype}_cha},1}kh1]]}}{{description=@{spiritenotes}}}"></button>
-                    </div>
-                    <input type="checkbox" class="hiddencheckbox spiriteboundcheckbox" name="attr_spiritebound">
-                    <div class="checkboxticker spiriteboundunticked"></div>
-                    <div class="checkboxticker spiriteboundticked">X</div>
-                    <div class="spiritspacer"></div>
-                    <input class="spiritenotescheckbox hiddencheckbox" type="checkbox" name="attr_showposspiritenotes" title="Need more Space?">
-                    <div class="checkboxticker spiritenotesunticked"></div>
-                    <div class="checkboxticker spiritenotesticked">X</div>
-                    <div class="spiritenoteswrapper">
-                        <textarea name="attr_spiritenotes" title="Have more Space!"></textarea>
-                    </div>
-                </div>
+                <details>
+                    <summary class="spiriterow">
+                        <div class="spiritenamewrapper">
+                            <input type="text" name="attr_spiritename" title="Name of your little Helper">
+                        </div>
+                        <div class="spiritetypewrapper" title="What Type of Spirit">
+                            <select name="attr_spirittype">
+                                <option value="@{air">Air Spirit</option>
+                                <option value="@{earth">Earth Spirit</option>
+                                <option value="@{beast">Beast Spirit</option>
+                                <option value="@{fire">Fire Spirit</option>
+                                <option value="@{man">Man Spirit</option>
+                                <option value="@{water">Water Spirit</option>
+                                <option value="@{guardian">Guardian Spirit</option>
+                                <option value="@{guidance">Guidance Spirit</option>
+                                <option value="@{plant">Plant Spirit</option>
+                                <option value="@{task">Task Spirit</option>
+                                <option value="@{ally">Ally Spirit</option>
+                            </select>
+                        </div>
+                        <div class="spiriteforcewrapper">
+                            <input type="text" name="attr_spiriteforce" title="Strength of your little Helper">
+                        </div>
+                        <div class="spiritserviceswrapper">
+                            <input type="text" name="attr_spiritservices" title="Number of Services owed">
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spriritinitiativeroll" title="Roll for Initiative with this Spirit"
+                                    value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{roll_name=for Initiative}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val3=Dice}}{{val3_num=[[2+?{Initiative Type|Astral,1|Physical,0}]]}}{{val2=Attributes}}{{val2_num=[[[[{@{spiriteforce}@{spirittype}_int},1}kh1]]*(1+?{Initiative Type})+[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]*(1-?{Initiative Type})]]}}{{initiative=[[[[{@{spiriteforce}@{spirittype}_int},1}kh1]]*(1+?{Initiative Type})+[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]*(1-?{Initiative Type})+(2+?{Initiative Type})d6 &{tracker}]]}}"></button>
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spirittest" title="Roll a Skill Test or a Test with 2 Attributes"
+                                    value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Dice-Pool Part1}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{val3=Dice-Pool Part2}}{{val3_num=[[{@{Spiriteforce}?{Part 2|Skill,-0|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force x2,*2},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Force,@{spiriteforce}|Physical,ceil((@{spiriteforce}*4@{spirittype}_str}*2@{spirittype}_rea}@{spirittype}_bod})/3)|Mental,ceil((@{spiriteforce}*4@{spirittype}_log}*2@{spirittype}_int}@{spirittype}_wil})/3)|Social,ceil((@{spiriteforce}*4)/3)|Astral,ceil((@{spiriteforce}*4)/3)|Armor,(@{spiriteforce}*3+@{spirittype}_bod})}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+[[{@{spiriteforce}?{Part 2},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Limit}]]]]}}"></button>
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spiritattribute" title="Roll a Test with a single Attributes"
+                                    value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spiritattributes" title="Output Attributes to Chat"
+                                    value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spirittype}_name})}}{{roll_name=his stats}}{{val1=Body}}{{val1_num=[[{@{spiriteforce}@{spirittype}_bod},1}kh1]]}}{{val2=Agility}}{{val2_num=[[{@{spiriteforce}@{spirittype}_agi},1}kh1]]}}{{val3=Reaction}}{{val3_num=[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]}}{{val4=Strength}}{{val4_num=[[{@{spiriteforce}@{spirittype}_str},1}kh1]]}}{{val5=Willpower}}{{val5_num=[[{@{spiriteforce}@{spirittype}_wil},1}kh1]]}}{{val6=Logic}}{{val6_num=[[{@{spiriteforce}@{spirittype}_log},1}kh1]]}}{{val7=Intuition}}{{val7_num=[[{@{spiriteforce}@{spirittype}_int},1}kh1]]}}{{val8=Charisma}}{{val8_num=[[{@{spiriteforce}@{spirittype}_cha},1}kh1]]}}{{description=@{spiritenotes}}}"></button>
+                        </div>
+                        <input type="checkbox" class="hiddencheckbox spiriteboundcheckbox" name="attr_spiritebound">
+                        <div class="checkboxticker spiriteboundunticked"></div>
+                        <div class="checkboxticker spiriteboundticked">X</div>
+                    </summary>
+                    <textarea name="attr_spiritenotes" title="Have more Space!"></textarea>
+                </details>
             </fieldset>
         </div>
     </div>
@@ -8664,55 +8661,48 @@ make sure to enter what the spell is resisted with">
                 <div class="spiriteboundwrapper">
                     <label>Registered</label>
                 </div>
-                <div class="spiritenoteslabelwrapper">
-                    <label>Notes</label>
-                </div>
             </div>
             <fieldset class="repeating_spirites">
-                <div class="spiriterow">
-                    <div class="spiritenamewrapper">
-                        <input type="text" name="attr_spiritename" title="Name of your little Helper">
-                    </div>
-                    <div class="spiritetypewrapper" title="What Type of Sprite">
-                        <select name="attr_spritetype">
-                            <option value="@{courier">Courier Sprite</option>
-                            <option value="@{crack">Crack Sprite</option>
-                            <option value="@{data">Data Sprite</option>
-                            <option value="@{fault">Fault Sprite</option>
-                            <option value="@{machine">Machine Sprite</option>
-                            <option value="@{companion">Companion Sprite</option>
-                            <option value="@{generalist">Generalist Sprite</option>
-                        </select>
-                    </div>
-                    <div class="spiriteforcewrapper">
-                        <input type="text" name="attr_spiriteforce" title="Strength of your little Helper">
-                    </div>
-                    <div class="spiritserviceswrapper">
-                        <input type="text" name="attr_spiritservices" title="Number of Services owed">
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spriteinitiativeroll" title="Roll for Initiative with this Sprite" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{roll_name=for Matrix Initiative}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Data Processing}}{{val2_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val3=Dice}}{{val3_num=[[4]]}}{{initiative=[[@{spiriteforce}+[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]+4d6 &{tracker}]]}}"></button>
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spritetest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{limit=Limit}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit_num=[[@{spiriteforce}?{Limit|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall},1}kh1]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+@{spiriteforce}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[{@{spiriteforce}?{Limit},1}kh1]]]]}}"></button>
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spriteattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
-                    </div>
-                    <div class="spiriterollwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spriteattributes" title="Output Attributes to Chat" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{roll_name=his stats}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attack}}{{val2_num=[[{@{spiriteforce}@{spritetype}_attack},1}kh1]]}}{{val3=Sleaze}}{{val3_num=[[{@{spiriteforce}@{spritetype}_sleaze},1}kh1]]}}{{val4=Data Proc.}}{{val4_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val5=Firewall}}{{val5_num=[[{@{spiriteforce}@{spritetype}_firewall},1}kh1]]}}{{description=@{spiritenotes}}}"></button>
-                    </div>
-                    <input type="checkbox" class="hiddencheckbox spiriteboundcheckbox" name="attr_spiritebound">
-                    <div class="checkboxticker spiriteboundunticked"></div>
-                    <div class="checkboxticker spiriteboundticked">X</div>
-                    <div class="spiritspacer"></div>
-                    <input class="spiritenotescheckbox hiddencheckbox" type="checkbox" name="attr_showposspiritenotes" title="Need more Space?">
-                    <div class="checkboxticker spiritenotesunticked"></div>
-                    <div class="checkboxticker spiritenotesticked">X</div>
-                    <div class="spiritenoteswrapper">
-                        <textarea name="attr_spiritenotes" title="Have more Space!"></textarea>
-                    </div>
-                </div>
+                <details>
+                    <summary class="spiriterow">
+                        <div class="spiritenamewrapper">
+                            <input type="text" name="attr_spiritename" title="Name of your little Helper">
+                        </div>
+                        <div class="spiritetypewrapper" title="What Type of Sprite">
+                            <select name="attr_spritetype">
+                                <option value="@{courier">Courier Sprite</option>
+                                <option value="@{crack">Crack Sprite</option>
+                                <option value="@{data">Data Sprite</option>
+                                <option value="@{fault">Fault Sprite</option>
+                                <option value="@{machine">Machine Sprite</option>
+                                <option value="@{companion">Companion Sprite</option>
+                                <option value="@{generalist">Generalist Sprite</option>
+                            </select>
+                        </div>
+                        <div class="spiriteforcewrapper">
+                            <input type="text" name="attr_spiriteforce" title="Strength of your little Helper">
+                        </div>
+                        <div class="spiritserviceswrapper">
+                            <input type="text" name="attr_spiritservices" title="Number of Services owed">
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spriteinitiativeroll" title="Roll for Initiative with this Sprite" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{roll_name=for Matrix Initiative}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Data Processing}}{{val2_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val3=Dice}}{{val3_num=[[4]]}}{{initiative=[[@{spiriteforce}+[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]+4d6 &{tracker}]]}}"></button>
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spritetest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{limit=Limit}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit_num=[[@{spiriteforce}?{Limit|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall},1}kh1]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+@{spiriteforce}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[{@{spiriteforce}?{Limit},1}kh1]]]]}}"></button>
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spriteattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
+                        </div>
+                        <div class="spiriterollwrapper">
+                            <button type="roll" class="spellrollmage" name="roll_spriteattributes" title="Output Attributes to Chat" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename} (@{spritetype}_name})}}{{roll_name=his stats}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attack}}{{val2_num=[[{@{spiriteforce}@{spritetype}_attack},1}kh1]]}}{{val3=Sleaze}}{{val3_num=[[{@{spiriteforce}@{spritetype}_sleaze},1}kh1]]}}{{val4=Data Proc.}}{{val4_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val5=Firewall}}{{val5_num=[[{@{spiriteforce}@{spritetype}_firewall},1}kh1]]}}{{description=@{spiritenotes}}}"></button>
+                        </div>
+                        <input type="checkbox" class="hiddencheckbox spiriteboundcheckbox" name="attr_spiritebound">
+                        <div class="checkboxticker spiriteboundunticked"></div>
+                        <div class="checkboxticker spiriteboundticked">X</div>
+                    </summary>
+                    <textarea name="attr_spiritenotes" title="Have more Space!"></textarea>
+                </details>
             </fieldset>
         </div>
     </div>