diff --git a/Burning Wheel/Burning Wheel.html b/Burning Wheel/Burning Wheel.html
index f52e01ec12..68429db11f 100644
--- a/Burning Wheel/Burning Wheel.html	
+++ b/Burning Wheel/Burning Wheel.html	
@@ -100,32 +100,38 @@
       <h1>Beliefs</h1>
       <table class="page1">
         <tr>
-          <td class="left"><input style="text-align:center; border:none; width:140px;" class="big trait smallcaps" type="text" name="attr_belief1-name" value="Belief 1">
+          <td class="left nowrap">
+            &nbsp;<input type="checkbox" class="fpd" name="attr_belief1F" title="Belief played this session?">
+            <input style="text-align:center; border:none; width:120px;" class="big trait smallcaps" type="text" name="attr_belief1-name" value="Belief 1">
             <br>
-            <input placeholder="F" type="number" class="smallbubble" name="attr_belief1F_max" title="Total Fate earned from this belief">
-            <input placeholder="P" type="number" class="smallbubble" name="attr_belief1P_max" title="Total Persona earned from this belief">
-            <input placeholder="D" type="number" class="smallbubble" name="attr_belief1D_max" title="Total Deeds earned from this belief">
-            &ensp;<button type="roll" class="quote" name="attr_belief1-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief1-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=1}} {{text=@{belief1}}}"></button>&emsp;
+            <input placeholder="F" type="text" class="smallbubble" name="attr_belief1F_max" title="Total Fate earned from this belief">
+            <input placeholder="P" type="text" class="smallbubble" name="attr_belief1P_max" title="Total Persona earned from this belief">
+            <input placeholder="D" type="text" class="smallbubble" name="attr_belief1D_max" title="Total Deeds earned from this belief">
+            &ensp;<button type="roll" class="quote" name="attr_belief1-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief1-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=Primary}} {{text=@{belief1}}}"></button>&emsp;
           </td>
           <td class="right"><textarea spellcheck="false" style="height:60px;" class="box" name="attr_belief1"></textarea></td>
         </tr>
         <tr>
-          <td class="left"><input style="text-align:center; border:none; width:140px;" class="big trait smallcaps" type="text" name="attr_belief2-name" value="Belief 2">
+          <td class="left nowrap">
+            &nbsp;<input type="checkbox" class="fpd" name="attr_belief2F" title="Belief played this session?">
+            <input style="text-align:center; border:none; width:120px;" class="big trait smallcaps" type="text" name="attr_belief2-name" value="Belief 2">
             <br>
-            <input placeholder="F" type="number" class="smallbubble" name="attr_belief2F_max" title="Total Fate earned from this belief">
-            <input placeholder="P" type="number" class="smallbubble" name="attr_belief2P_max" title="Total Persona earned from this belief">
-            <input placeholder="D" type="number" class="smallbubble" name="attr_belief2D_max" title="Total Deeds earned from this belief">
-            &ensp;<button type="roll" class="quote" name="attr_belief2-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief2-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=1}} {{text=@{belief2}}}"></button>&emsp;
+            <input placeholder="F" type="text" class="smallbubble" name="attr_belief2F_max" title="Total Fate earned from this belief">
+            <input placeholder="P" type="text" class="smallbubble" name="attr_belief2P_max" title="Total Persona earned from this belief">
+            <input placeholder="D" type="text" class="smallbubble" name="attr_belief2D_max" title="Total Deeds earned from this belief">
+            &ensp;<button type="roll" class="quote" name="attr_belief2-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief2-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=Secondary}} {{text=@{belief2}}}"></button>&emsp;
           </td>
           <td class="right"><textarea spellcheck="false" style="height:60px;" class="box" name="attr_belief2"></textarea></td>
         </tr>
         <tr>
-          <td class="left"><input style="text-align:center; border:none; width:140px;" class="big trait smallcaps" type="text" name="attr_belief3-name" value="Belief 3">
+          <td class="left nowrap">
+            &nbsp;<input type="checkbox" class="fpd" name="attr_belief3F" title="Belief played this session?">
+            <input style="text-align:center; border:none; width:120px;" class="big trait smallcaps" type="text" name="attr_belief3-name" value="Belief 3">
             <br>
-            <input placeholder="F" type="number" class="smallbubble" name="attr_belief3F_max" title="Total Fate earned from this belief">
-            <input placeholder="P" type="number" class="smallbubble" name="attr_belief3P_max" title="Total Persona earned from this belief">
-            <input placeholder="D" type="number" class="smallbubble" name="attr_belief3D_max" title="Total Deeds earned from this belief">
-            &ensp;<button type="roll" class="quote" name="attr_belief3-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief3-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=1}} {{text=@{belief3}}}"></button>&emsp;
+            <input placeholder="F" type="text" class="smallbubble" name="attr_belief3F_max" title="Total Fate earned from this belief">
+            <input placeholder="P" type="text" class="smallbubble" name="attr_belief3P_max" title="Total Persona earned from this belief">
+            <input placeholder="D" type="text" class="smallbubble" name="attr_belief3D_max" title="Total Deeds earned from this belief">
+            &ensp;<button type="roll" class="quote" name="attr_belief3-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief3-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=Tertiary}} {{text=@{belief3}}}"></button>&emsp;
           </td>
           <td class="right"><textarea spellcheck="false" style="height:60px;" class="box" name="attr_belief3"></textarea></td>
         </tr>
@@ -133,11 +139,13 @@
       <fieldset class="repeating_belief">
         <table  class="page1">
           <tr>
-            <td class="left"><input style="text-align:center; border:none; width:140px;" class="big trait smallcaps" type="text" name="attr_belief-name" placeholder="Belief X">
+            <td class="left nowrap">
+              &nbsp;<input type="checkbox" class="fpd" name="attr_beliefF" title="Belief played this session?">
+              <input style="text-align:center; border:none; width:120px;" class="big trait smallcaps" type="text" name="attr_belief-name" placeholder="Belief X">
               <br>
-              <input placeholder="F" type="number" class="smallbubble" name="attr_beliefF_max" title="Total Fate earned from this belief">
-              <input placeholder="P" type="number" class="smallbubble" name="attr_beliefP_max" title="Total Persona earned from this belief">
-              <input placeholder="D" type="number" class="smallbubble" name="attr_beliefD_max" title="Total Deeds earned from this belief">
+              <input placeholder="F" type="text" class="smallbubble" name="attr_beliefF_max" title="Total Fate earned from this belief">
+              <input placeholder="P" type="text" class="smallbubble" name="attr_beliefP_max" title="Total Persona earned from this belief">
+              <input placeholder="D" type="text" class="smallbubble" name="attr_beliefD_max" title="Total Deeds earned from this belief">
               &ensp;<button type="roll" class="quote" name="attr_belief-quote" title="Quote belief to chat" value="&{template:bwquote} {{slot1=@{belief-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Belief}} {{slot3=Bonus}} {{text=@{belief}}}"></button>&emsp;
             </td>
             <td class="right"><textarea spellcheck="false" style="height:60px;" class="box" name="attr_belief"></textarea></td>
@@ -149,25 +157,25 @@
       <table class="page1">
         <tr>
           <td class="left nowrap">
-            <input placeholder="F" type="number" class="smallbubble" name="attr_instinct1F_max" title="Total Fate earned from this instinct">
+            <input placeholder="F" type="text" class="smallbubble" name="attr_instinct1F_max" title="Total Fate earned from this instinct">
             <input style="text-align:center; border:none; width:100px;" class="big trait" type="text" name="attr_instinct1-name" value="Instinct 1">
-            <button type="roll" class="quote" name="attr_instinct1-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct1-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}}  {{title3=Instinct}} {{slot3=1}} {{text=@{instinct1}}}"></button>&emsp;
+            <button type="roll" class="quote" name="attr_instinct1-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct1-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}}  {{title3=Instinct}} {{slot3=Primary}} {{text=@{instinct1}}}"></button>&emsp;
           </td>
           <td class="right"><textarea spellcheck="false" style="height:40px;" class="box" name="attr_instinct1"></textarea></td>
         </tr>
         <tr>
           <td class="left nowrap">
-            <input placeholder="F" type="number" class="smallbubble" name="attr_instinct2F_max" title="Total Fate earned from this instinct">
+            <input placeholder="F" type="text" class="smallbubble" name="attr_instinct2F_max" title="Total Fate earned from this instinct">
             <input style="text-align:center; border:none; width:100px;" class="big trait" type="text" name="attr_instinct2-name" value="Instinct 2">
-            <button type="roll" class="quote" name="attr_instinct2-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct2-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}}  {{title3=Instinct}} {{slot3=2}} {{text=@{instinct2}}}"></button>&emsp;
+            <button type="roll" class="quote" name="attr_instinct2-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct2-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}}  {{title3=Instinct}} {{slot3=Secondary}} {{text=@{instinct2}}}"></button>&emsp;
           </td>
           <td class="right"><textarea spellcheck="false" style="height:40px;" class="box" name="attr_instinct2"></textarea></td>
         </tr>
         <tr>
           <td class="left nowrap">
-            <input placeholder="F" type="number" class="smallbubble" name="attr_instinct3F_max" title="Total Fate earned from this instinct">
+            <input placeholder="F" type="text" class="smallbubble" name="attr_instinct3F_max" title="Total Fate earned from this instinct">
             <input style="text-align:center; border:none; width:100px;" class="big trait" type="text" name="attr_instinct3-name" value="Instinct 3">
-            <button type="roll" class="quote" name="attr_instinct3-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct3-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}}  {{title3=Instinct}} {{slot3=3}} {{text=@{instinct3}}}"></button>&emsp;
+            <button type="roll" class="quote" name="attr_instinct3-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct3-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}}  {{title3=Instinct}} {{slot3=Tertiary}} {{text=@{instinct3}}}"></button>&emsp;
           </td>
           <td class="right"><textarea spellcheck="false" style="height:40px;" class="box" name="attr_instinct3"></textarea></td>
         </tr>
@@ -176,7 +184,7 @@
         <table  class="page1">
           <tr>
             <td class="left nowrap">
-              <input placeholder="F" type="number" class="smallbubble" name="attr_instinctF_max" title="Total Fate earned from this instinct">
+              <input placeholder="F" type="text" class="smallbubble" name="attr_instinctF_max" title="Total Fate earned from this instinct">
               <input style="text-align:center; border:none; width:100px;" class="big trait" type="text" name="attr_instinct-name" placeholder="Instinct X">
               <button type="roll" class="quote" name="attr_instinct-quote" title="Quote instinct to chat" value="&{template:bwquote} {{slot1=@{instinct-name}}} {{shade=[[4]]}} {{title2=Character}} {{slot2=@{character_name}}} {{title3=Instinct}} {{slot3=Bonus}} {{text=@{instinct}}}"></button>&emsp;
             </td>
@@ -264,7 +272,7 @@
           <td style="vertical-align: top;">
             <fieldset class="repeating_charactertrait">
               <span class="nowrap">
-                <input type="number" class="smallbubble" name="attr_charactertraitF_max" title="Total Fate earned from this trait" placeholder="F">
+                <input type="text" class="smallbubble" name="attr_charactertraitF_max" title="Total Fate earned from this trait" placeholder="F">
                 <input style="width:30%;" class="trait" type="text" name="attr_charactertrait-name" placeholder="Char / Cos Trait">
                 <textarea spellcheck="false" style="width:53%;" class="trait" name="attr_charactertrait" placeholder="Description"/></textarea>
                 <select style="width:10%;" class="stat-selection" name="attr_charactertrait-status">
@@ -880,7 +888,7 @@
           <tr>
             <td class="statname top">Focus</td>
             <td class="italic top nowrap">1 Persona</td>
-            <td class="top">Counteract a time-based failure complication while working carefully</td>
+            <td class="top">Counteract a time-based failure complication while working carefully (+1D)</td>
           </tr>
           <tr bgcolor="#E8E8E8">
             <td class="statname top">Grit Your Teeth</td>
@@ -3315,68 +3323,121 @@
         <div class="tab4">
           <div style="display:inline-block; width:100%;">
             <div class="nowrap relative">
-              <h3 class="left smallcaps">Additional Taxes</h3>
-              <input type="checkbox" name="attr_taxesshow" class="showhide" title="Show/Hide additional Tax options" />
+              <h3 class="left smallcaps">Edit Layout & Taxes</h3>
+              <input type="checkbox" name="attr_taxesshow" class="showhide" title="Show/Hide additional Tax options" checked/>
               <span></span>
-              <div class="showhide">
+              <div class="showhide relative">
+                <div class="table">
+                  <div class="row">
+                    <input type="text" class="underline full center" name="attr_magic-title_true" value="Songs and Spells"/>
+                  </div>
+                  <div class="3colrow">
+                    <div class="col">
+                      <input type="text" class="underline left long smallcaps" name="attr_spell-title1_true" value="Name"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="underline left long smallcaps" name="attr_spell-title2_true" value="Ob"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="underline left long smallcaps" name="attr_spell-title3_true" value="Actions"/>
+                    </div>
+                  </div>
+                  <div class="3colrow">
+                    <div class="col">
+                      <input type="text" class="underline left long" name="attr_spell-title4_true" value="Origin"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="underline left long" name="attr_spell-title5_true" value="Element"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="underline left long" name="attr_spell-title6_true" value="Duration"/>
+                    </div>
+                  </div>
+                  <div class="3colrow">
+                    <div class="col">
+                      <input type="text" class="underline left long" name="attr_spell-title7_true" value="Area"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="underline left long" name="attr_spell-title8_true" value="Impetus"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="underline left long" name="attr_spell-title9_true" value="Cost"/>
+                    </div>
+                  </div>
+                  <div class="3colrow">
+                    <div class="col">
+                      <input type="text" class="nowrap underline full center" name="attr_magic-notes1-title_true" value="Rituals"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="nowrap underline full center" name="attr_magic-notes2-title_true" value="Artefacts"/>
+                    </div>
+                    <div class="col">
+                      <input type="text" class="nowrap underline full center" name="attr_magic-notes3-title_true" value="Secrets"/>
+                    </div>
+                  </div>
+                </div>
+                <span style="width:90%;">Above are the facets of a sorcerous spell, as described on pg 500 of BWG, but you can edit them here for use with Elven spell songs, other magic
+                  <br>types found in the Codex, or your own homebrew content. Below you can individually Tax any stat or attribute, as well as change their names.</span>
+                <div class="spacer-half"></div>
                 <div class="table">
                   <div class="3colrow nowrap">
                       <div class="col nowrap">
-                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_perception_name_true" value="Perception"></div>
+                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_perception_name_true" value="Perception"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_perception_tax" title="@{perception_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_power_name_true" value="Power"></div>
+                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_power_name_true" value="Power"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_power_tax" title="@{power_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_agility_name_true" value="Agility"></div>
+                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_agility_name_true" value="Agility"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_agility_tax" title="@{agility_tax}" value="0"></div>
                       </div>
                   </div>
                   <div class="3colrow nowrap">
                       <div class="col nowrap">
-                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_will_name_true" value="Will"></div>
+                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_will_name_true" value="Will"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_will_tax" title="@{will_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_forte_name_true" value="Forte"></div>
+                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_forte_name_true" value="Forte"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_forte_tax" title="@{forte_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_speed_name_true" value="Speed"></div>
+                        <div class="col 2col bold big smallcaps"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_speed_name_true" value="Speed"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_speed_tax" title="@{speed_tax}" value="0"></div>
                       </div>
                   </div>
                   <div class="3colrow nowrap">
                       <div class="col nowrap">
-                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_health_name_true" value="Health"></div>
+                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_health_name_true" value="Health"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_health_tax" title="@{health_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_circles_name_true" value="Circles"></div>
+                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_circles_name_true" value="Circles"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_circles_tax" title="@{circles_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_custom1_name" placeholder="Emotion 1"></div>
+                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_custom1_name" placeholder="Emotion 1"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_custom1_tax" title="@{custom1_tax}" value="0"></div>
                       </div>
                   </div>
                   <div class="3colrow nowrap">
                       <div class="col nowrap">
-                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_steel_name_true" value="Steel"></div>
+                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_steel_name_true" value="Steel"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_steel_tax" title="@{steel_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_resources_name_true" value="Resources"></div>
+                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_resources_name_true" value="Resources"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_resources_tax" title="@{resources_tax}" value="0"></div>
                       </div>
                       <div class="col nowrap">
-                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em;" name="attr_custom2_name" placeholder="Emotion 2"></div>
+                        <div class="col 2col bold big"><input type="text" class="statname" style="width: 100px; font-size: 1em; border-bottom:1px solid black;" name="attr_custom2_name" placeholder="Emotion 2"></div>
                         <div class="col 2col right"><input type="number" class="smallbubble" name="attr_custom2_tax" title="@{custom2_tax}" value="0"></div>
                       </div>
                   </div>
                 </div>
+                <div class="spacer-half"></div>
               </div>
             </div>
             <div class="table">
@@ -3441,8 +3502,8 @@
                     </select>
                     &ensp;<input type="text" class="underline stat" name="attr_spellexp" title="@{spellexp}" value="0">
                     <div class="spacer-half"></div>
-                    <input type="checkbox" class="box" name="attr_spellcheck1" title="Sustained"/>
-                    &emsp;<input type="checkbox" class="box" name="attr_spellcheck2" title="Used"/>
+                    <input type="checkbox" class="fdp" name="attr_spellcheck1" title="Sustained?"/>&ensp;<span class="italic">S</span>
+                    &emsp;<input type="checkbox" class="fdp" name="attr_spellcheck2" title="Used?"/>&ensp;<span class="italic">U</span>
                   </div>
                   <div class="col" style="width:85%;">
                     <textarea spellcheck="false" style="height:6em; border:none;" name="attr_spellnotes" placeholder="Description / effect"></textarea>
@@ -3475,62 +3536,6 @@
                 </div>
               </div>
             </div>
-            <div class="nowrap relative">
-              <h3 class="right smallcaps">Edit Layout</h3>
-              <input type="checkbox" name="attr_layoutshow" class="showhide relative" title="Show/Hide editable spell subtitles" />
-              <span></span>
-              <div class="showhide relative">
-                <div class="table">
-                  <div class="row">
-                    <input type="text" class="underline full center" name="attr_magic-title_true" value="Songs and Spells"/>
-                  </div>
-                  <div class="3colrow">
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title1_true" value="Name"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title2_true" value="Ob"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title3_true" value="Actions"/>
-                    </div>
-                  </div>
-                  <div class="3colrow">
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title4_true" value="Origin"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title5_true" value="Element"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title6_true" value="Duration"/>
-                    </div>
-                  </div>
-                  <div class="3colrow">
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title7_true" value="Area"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title8_true" value="Impetus"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="underline left long" name="attr_spell-title9_true" value="Cost"/>
-                    </div>
-                  </div>
-                  <div class="3colrow">
-                    <div class="col">
-                      <input type="text" class="nowrap underline full center" name="attr_magic-notes1-title_true" value="Rituals"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="nowrap underline full center" name="attr_magic-notes2-title_true" value="Artefacts"/>
-                    </div>
-                    <div class="col">
-                      <input type="text" class="nowrap underline full center" name="attr_magic-notes3-title_true" value="Secrets"/>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
           </div>
         </div>
         <!-- END OF TAB 4  -->
@@ -4392,7 +4397,7 @@
             <div class="col relative top" style="width:65%;">
               <table class="lifepath top">
                 <tr>
-                  <th class="big" style="width:30%;"><input type="number" disabled="disabled" name="attr_current_skill_points" value="(@{skill_total}+@{gen_total})-(@{skill_cost_total})" title="Remaining skill pts" style="width:25px;"/>&sol;<input title="Total LP + General skill pts" type="number" disabled="disabled" name="attr_skill_total-reminder" value="(@{skill_total}+@{gen_total})">&nbsp;pts</th>
+                  <th class="big" style="width:30%;"><input type="number" disabled="disabled" name="attr_current_skill_points" value="(@{skill_total}+@{gen_total})-(@{skill_cost_total})" title="Remaining skill pts" style="width:35px;"/>&sol;<input title="Total LP + General skill pts" type="number" disabled="disabled" name="attr_skill_total-reminder" value="(@{skill_total}+@{gen_total})" style="width:35px;">&nbsp;pts</th>
                   <th class="center" style="width:25%;">Root</th>
                   <th class="center" style="border-bottom:1px solid black; width:5%;">Req.</th>
                   <th class="center" style="border-bottom:1px solid black; width:10%;">Open</th>
@@ -4427,7 +4432,7 @@
                       <option value="@{custom2}">Custom 2</option>
                     </select>
                   </td>
-                  <td class="center" style="border-width:0 0 1px 0"><input type="checkbox" name="attr_skill_req1"/></td>
+                  <td class="center" style="border-width:0 0 1px 0"><input type="checkbox" name="attr_skill_req1" checked/></td>
                   <td class="center" style="border-width:0 0 1px 0"><input type="checkbox" class="box" name="attr_skill_open1" value="1"></td>
                   <td class="center" style="border-width:0 0 1px 0">
                     <select class="box" name="attr_skill_shade1" title="">
@@ -5622,15 +5627,14 @@
             <div class="col">
               <table class="lifepath" style="margin-right: 10px;">
                 <tr>
-                  <th class="big">6. Traits<input type="number" disabled="disabled" name="attr_trait_cost_total" value="@{trait_total}-(@{traitlcost1}+0)-(@{traitlcost2}+0)-(@{traitlcost3}+0)-(@{traitlcost4}+0)-(@{traitlcost5}+0)-(@{traitlcost6}+0)-(@{traitlcost7}+0)-(@{traitlcost8}+0)-(@{traitlcost9}+0)-(@{traitlcost10}+0)-(@{traitlcost11}+0)-(@{traitlcost12}+0)-(@{traitlcost13}+0)-(@{traitlcost14}+0)-(@{traitlcost15}+0)-(@{traitlcost16}+0)-(@{traitlcost17}+0)-(@{traitlcost18}+0)-(@{traitlcost19}+0)-(@{traitlcost20}+0)">&sol;<input type="number" disabled="disabled" name="attr_trait_cost_total-reminder" value="@{trait_total}+0"></th>
-                  <th class="left">pts</th>
+                  <th class="big" colspan="2">6. Traits<input style="width:35px;" type="number" disabled="disabled" name="attr_trait_cost_total" value="@{trait_total}-(@{traitlcost1}+0)-(@{traitlcost2}+0)-(@{traitlcost3}+0)-(@{traitlcost4}+0)-(@{traitlcost5}+0)-(@{traitlcost6}+0)-(@{traitlcost7}+0)-(@{traitlcost8}+0)-(@{traitlcost9}+0)-(@{traitlcost10}+0)-(@{traitlcost11}+0)-(@{traitlcost12}+0)-(@{traitlcost13}+0)-(@{traitlcost14}+0)-(@{traitlcost15}+0)-(@{traitlcost16}+0)-(@{traitlcost17}+0)-(@{traitlcost18}+0)-(@{traitlcost19}+0)-(@{traitlcost20}+0)">&sol;<input style="width:35px;" type="number" disabled="disabled" name="attr_trait_cost_total-reminder" value="@{trait_total}+0"></th>
                   <th class="center">Req.</th>
                   <th class="center">Cost</th>
                   <th class="center">Type</th>
                 </tr>
                 <tr>
                   <td colspan="2"><input type="text" class="skillname" name="attr_trait_name1"></td>
-                  <td class="center"><input type="checkbox" name="attr_trait_req1"></td>
+                  <td class="center"><input type="checkbox" name="attr_trait_req1" checked></td>
                   <td class="center"><input type="number" name="attr_traitlcost1"></td>
                   <td>
                     <select class="stat-selection" style="border:none;" name="attr_trait_type1" class="age">
@@ -6027,7 +6031,7 @@
           <div class="col" style="width:100%;">
             <table class="lifepath" style="width:100%;">
               <tr>
-                <th colspan="4" class="big">8. Resource Points<input type="number" class="box" style="height: 17px;" disabled=disabled name="attr_resourcepoints" value="@{res_total}-(@{resource_totala}+0)-(@{resource_totalb}+0)">&sol;<input type="number" class="box" style="height: 17px;" disabled=disabled name="attr_resourcepoints" value="(@{res_total}+0)"> rps</th>
+                <th colspan="4" class="big">8. Resource Points<input type="number" class="box normal" style="height: 17px; width:35px;" disabled=disabled name="attr_resourcepoints" value="@{res_total}-(@{resource_totala}+0)-(@{resource_totalb}+0)">&sol;<input type="number" class="box normal" style="height: 17px; width:35px;" disabled=disabled name="attr_resourcepoints" value="(@{res_total}+0)"> rps</th>
               </tr>
               <tr>
                 <td class="noborder bold" style="width:50%;">&ensp;Gear, relationships, spells, etc.</td>