diff --git a/Palladium Fantasy 1E/ReadMe.md b/Palladium Fantasy 1E/ReadMe.md
index 10eda4bb0c..7292c18089 100644
--- a/Palladium Fantasy 1E/ReadMe.md	
+++ b/Palladium Fantasy 1E/ReadMe.md	
@@ -24,16 +24,16 @@ This example is the macro I use for the healer ability Healing Touch.
 
 ### Auto Calculated Stat Bonuses
 - I.Q. bonuses are auto calculated and displayed at the top of the Skills tab.  Any bonus is subtracted from the percentile roll in the OCC, Elective, and Secondary skill sections.
-- M.A. bonus to trust and intimidate is autocalculated and displayed in the gold section below the stats.
-- P.S. bonus to damage is autocalulated and displayed on the Combat Tab under Hand to Hand Combat skill.  This will be included in any damage roll from the melee attack section of the Basic tab.
-- P.P. bonuses to parry and dodge are autocalculated and displayed on the Combat Tab under Hand to Hand Combat skill.  This will be included in rolling Dodge in the light blue section of the Basic tab, or rolling parry in the Melee Attacks section of the basic tab.
-- P.B. bonuses to charm and impress are autocalculated and displayed in the gold section under the stats.
-- Spd. is autocalculated to rough miles per hour and displayed in the gold section below the stats.  It also calculates movement per action in case people are using that 2E mechanic.
+- M.A. bonus to trust and intimidate is autocalculated and displayed in the light blue section.
+- P.S. bonus to damage is autocalulated and displayed on the Combat Tab under Hand to Hand Combat skill.  This will be included in any damage roll from the melee attack section of the Statistics tab.
+- P.P. bonuses to parry and dodge are autocalculated and displayed on the Combat Tab under Hand to Hand Combat skill.  This will be included in rolling Dodge in the light blue section of the Statistics tab, or rolling parry in the Melee Attacks section of the Statistics tab.
+- P.B. bonuses to charm and impress are autocalculated and displayed in the light blue section.
+- Spd. is autocalculated to rough miles per hour and displayed in the gold section.  It also calculates movement per action in case people are using that 2E mechanic.
 - Saving throw bonuses from M.E. and P.E. are autocalculated and displayed below the rolls in the Saving Throw section of the combat tab.  They are included in the calculation of the rolls.
 
 ### Stat Rolls
 - The stat rolls are set up to roll 2 numbers.  The first is a d20, and the second is d100.
-- The "Perception" roll in the light blue section of the Basic tab is basically a d20 stat check.  It takes the average (rounded down) of the I.Q. and M.E. for a target number. Since perception doesn't exist in 1E, this was my personal solution.
+- The "Perception" roll in the light blue section of the Basic tab is basically a d20 stat check.  It takes the average (rounded down) of the I.Q. and M.E. for a target number. Since perception doesn't exist in 1E, this was my personal solution.  Use it or ignore it as you wish.
 
 ### Extra Attributes
 - The right hand column of the Basic tab has quite a list of things there.  This is all to facilitate the creation of macros and being able to link tokens easily to different resources.
@@ -57,7 +57,7 @@ This example is the macro I use for the healer ability Healing Touch.
 - This repeating section does not autocalculate values.  You can temporarily change the Spd attribute to get all the different calculated values to enter manually.
 
 ### Melee Attacks
-- This repeating section will pull in any bonuses found under the Hand to Hand Combat skill.  This includes changing the critical strike threshold if it is changed there.  Weapon proficiency bonuses will need to be added manually.
+- This repeating section will pull in any bonuses found under the Hand to Hand Combat skill, including P.S. or P.P. bonuses.  This also includes changing the critical strike threshold if it is changed there.  Weapon proficiency bonuses will need to be added manually.
 - Any info entered into notes will be displayed using the description part of the roll template, but will not appear at all if left blank.
 
 ### Ranged and Spell Attacks
@@ -90,4 +90,4 @@ This example is the macro I use for the healer ability Healing Touch.
 ```
 
 ### Disclaimer
-Palladium Fantasy 1E has been around a long while.  It is from an era where house rules were not frowned upon, but encouraged.  As such, I have tried to put enough options in this sheet to allow for creativity.  I am a definite novice at html, css, or anything else that has gone into this sheet, so any major revisions for automation may be beyond me.  It is in the current state due to the generous help of the Roll20 forum community.  As K.S. would say, Game On!
\ No newline at end of file
+Palladium Fantasy 1E has been around a long while.  It is from an era where house rules were not frowned upon, but encouraged.  As such, I have tried to put enough options in this sheet to allow for creativity.  I am a definite novice at html, css, or anything else that has gone into this sheet, so any major revisions for automation may be beyond me.  It is in the current state due to the generous help of the Roll20 forum community.  As K.S. would say, Game On!
diff --git a/Palladium Fantasy 1E/palladium-sheet-tab1.png b/Palladium Fantasy 1E/palladium-sheet-tab1.png
new file mode 100644
index 0000000000..1235191c2c
Binary files /dev/null and b/Palladium Fantasy 1E/palladium-sheet-tab1.png differ
diff --git a/Palladium Fantasy 1E/palladium_fantasy_1e.css b/Palladium Fantasy 1E/palladium_fantasy_1e.css
index bb852e0058..e3c5a44f83 100644
--- a/Palladium Fantasy 1E/palladium_fantasy_1e.css	
+++ b/Palladium Fantasy 1E/palladium_fantasy_1e.css	
@@ -10,6 +10,7 @@
 .sheet-tab3:checked ~ .sheet-tab3,
 .sheet-tab4:checked ~ .sheet-tab4,
 .sheet-tab5:checked ~ .sheet-tab5,
+.sheet-tab6:checked ~ .sheet-tab6
 {
     display: block;
 }
@@ -72,6 +73,9 @@
 .sheet-tab5 + span::before{
 	left: 433px;
 }
+.sheet-tab6 + span::before{
+    left: 534px;
+}
 .sheet-tab-content {
     border: 1px solid #a8a8a8;
     border-top-color: #000;
@@ -90,15 +94,18 @@
     background-color: #9cb09b; 
 }
 .sheet-tab2 { 
-    background-color: #cb9f75;
+    background-color: #9cb09b; 
 }
 .sheet-tab3 { 
-    background-color: #b8b782; 
+    background-color: #cb9f75;
 }
 .sheet-tab4 { 
-    background-color: #c6cdda; 
+    background-color: #b8b782; 
 }
 .sheet-tab5 { 
+    background-color: #c6cdda; 
+}
+.sheet-tab6 { 
     background-color: #9ca8ae; 
 }
 div.sheet-body {
@@ -118,44 +125,95 @@ div.sheet-body {
 .repcontrol{
     grid-column:1 / -1;
 }
-.sheet-stats-grid-container{
+.sheet-name-grid-container{
     display:grid;
-    grid-template-columns: 100px 213px 15px 75px 65px 55px 15px 75px 65px 55px
+    align-items:center;
+    padding-bottom:5px;
+    padding-left:10px;
+    grid-template-columns: 50px 213px 75px 213px
+}
+.sheet-class-grid-container{
+    display:grid;
+    align-items:center;
+    padding-left:5px;
+    grid-template-columns: 50px 213px 45px 100px 85px 213px
+}
+.sheet-class-stats{
+    width: 95px;
+}
+.sheet-middle-grid-container{
+    display:grid;
+    padding-top:10px;
+    padding-bottom:10px;
+    grid-template-columns: 160px 10px 160px 10px 185px 10px 180px
+}
+.sheet-blue-grid-container{
+    display:grid;
+    align-items:center;
+    padding:10px;
+    border:5px solid #6da6c2;
+    border-radius:10px;
+    grid-template-columns: 65px 65px
+}
+button[type=roll].sheet-statdice::before {
+    content: ''; 
+}
+.sheet-statdice{
+    background-color: #6da6c2;
+    color:black;
+}
+.sheet-gold-grid-container{
+    display:grid;
+    align-items:center;
+    padding:10px;
+    border:5px solid #c2b96d;
+    border-radius:10px;
+    grid-template-columns: 90px 65px
+}
+.sheet-ltblue-grid-container{
+    display:grid;
+    align-items:center;
+    padding:10px;
+    border:5px solid #8acfd5;
+    border-radius:10px;
+    grid-template-columns: 90px 75px
+}
+button[type=roll].sheet-rolldice::before {
+    content: ''; 
+}
+.sheet-rolldice{
+    background-color: #8acfd5;
+    color:black;
+}
+.sheet-roll-field, .sheet-caster-field{
+    width:65px;
+}
+.sheet-caster-grid-container{
+    display:grid;
+    align-items:center;
+    padding:10px;
+    border:5px solid #c28e6d;
+    border-radius:10px;
+    grid-template-columns: 90px 75px
+}
+.sheet-stat-title, .sheet-calc-title, .sheet-roll-title, .sheet-caster-title{
+    text-decoration:underline;
+}
+.sheet-name-stats, .sheet-class-stats, .sheet-occ-stats, .sheet-exp-stats, .sheet-minmax, 
+.sheet-calc-field, .sheet-roll-field, .sheet-caster-field, .sheet-physical-field, 
+.sheet-origin-field, .sheet-mental-field, .sheet-leaping-field, .sheet-movement-field, 
+.sheet-mattack-field, .sheet-damage-dice, .sheet-mattack-notes, .sheet-rattack-field,
+.sheet-rattack-notes, .sheet-weapon-field, .sheet-weapon-textarea, .sheet-armor-field, 
+.sheet-armor-textarea, .sheet-gear-field, .sheet-inventory-textarea, .sheet-consumable-field, 
+.sheet-wealth-field, .sheet-bonus-field, .sheet-occ-field, .sheet-skill-notes, .sheet-elective-field, 
+.sheet-secondary-field, .sheet-mystic-field, .sheet-melee-field, .sheet-ranged-field, 
+.sheet-combat-field, .sheet-combat-textarea, .sheet-save-field, .sheet-notes-field, .sheet-notes-textarea{
+    background-color:#ebebeb;
 }
 .sheet-fraction-grid-container{
     display:grid;
     grid-template-columns: 31px 3px 31px
 }
-.sheet-llabel{
-    background-color: #a4c26d;
-    text-align: right;
-}
-.sheet-mlabel{
-    background-color: #c2b96d;
-    text-align: right;
-}
-.sheet-stat{
-    background-color: #6da6c2;
-    text-align: right;
-    text-decoration: underline;
-}
-.sheet-statdice{
-    background-color: #6da6c2;
-}
-.sheet-mstats{
-    background-color: #c2b96d;
-}
-.sheet-rlabel{
-    background-color: #c28e6d;
-    text-align: right;
-}
-.sheet-clabel{
-    background-color: #8acfd5;
-    text-align: right;
-}
-.sheet-cstats{
-    background-color: #8acfd5;
-}
 .sheet-minmax{
     width: 31px;
 }
@@ -163,22 +221,48 @@ div.sheet-body {
     background-color: #5e6c5d;
 }
 .sheet-calc-field{
-    width: 65px;
+    width: 40px;
 }
-.sheet-statnumber{
-    width: 65px;
+.sheet-movement-container{
+    display:grid;
+    padding:10px;
+    border:5px solid #889987;
+    border-radius:10px;
+    max-width: 685px
 }
 .sheet-leap-grid-container{
     display:grid;
+    align-items:center;
     grid-template-columns: 150px 75px 75px 30px
 }
+.sheet-movement-panel{
+    padding-top:5px;
+}
 .sheet-movement-grid-container{
     display:grid;
-    grid-template-columns: 213px 60px 60px 60px 60px 60px auto
+    align-items:center;
+    grid-template-columns: 213px 70px 70px 70px 70px 60px 60px
+}
+.sheet-melee-attack-panel, .sheet-ranged-attack-panel{
+    padding:10px;
+}
+.sheet-melee-attack-panel{
+    border-bottom:5px solid #889987;
+    max-width:744px;
 }
 .sheet-mattack-grid-container{
     display:grid;
-    grid-template-columns: 213px 30px 50px 50px 30px 50px 50px 30px 60px 50px 120px
+    grid-template-columns: 210px 33px 50px 50px 35px 50px 50px 35px 60px 50px 120px
+}
+button[type=roll].sheet-meleedice::before {
+    content: ''; 
+}
+button[type=roll].sheet-rangeddice::before {
+    content: ''; 
+}
+.sheet-meleedice, .sheet-rangeddice{
+    background:#3d5a48;
+    color:#ebebeb;
 }
 .sheet-damage-dice{
     width: 60px;
@@ -186,12 +270,39 @@ div.sheet-body {
 .sheet-mattack-notes{
     width:120px;
 }
+.sheet-ranged-attack-panel{
+    max-width:744px;
+}
 .sheet-rattack-grid-container{
     display:grid;
-    grid-template-columns: 213px 30px 50px 50px 30px 60px 50px 50px 50px 150px
+    grid-template-columns: 210px 35px 50px 50px 35px 60px 50px 50px 50px 153px
 }
 .sheet-rattack-notes{
-    width: 150px;
+    width: 153px;
+}
+.sheet-physical-grid-container{
+    display:grid;
+    align-items:center;
+    padding-left:10px;
+    grid-template-columns: 110px 110px 110px 110px 110px
+}
+.sheet-physical-field{
+    width:100px;
+}
+.sheet-origin-grid-container{
+    display:grid;
+    align-items:center;
+    padding:10px;
+    grid-template-columns: 110px 220px 220px
+}
+.sheet-mental-grid-container{
+    display:grid;
+    align-items:center;
+    padding:10px;
+    grid-template-columns: 550px
+}
+.sheet-mental-field{
+    max-height:60px;
 }
 .sheet-weapon-grid-container{
     display:grid;
@@ -203,6 +314,10 @@ div.sheet-body {
 .sheet-weapon-textarea{
     max-height: 60px;
 }
+.sheet-weapon-inventory-panel, .sheet-armor-inventory-panel, .sheet-gear-inventory-panel, 
+.sheet-consumable-inventory-panel, .sheet-wealth-inventory-panel{
+    max-width:700px;
+}
 .sheet-armor-grid-container{
     display:grid;
     grid-template-columns: 213px 47px 47px 62px 47px auto
@@ -215,6 +330,7 @@ div.sheet-body {
 }
 .sheet-inventory-grid-container{
     display:grid;
+    align-items:center;
     grid-template-columns: 213px 213px 213px auto
 }
 .sheet-inventory-textarea{
@@ -223,25 +339,47 @@ div.sheet-body {
 .sheet-inventory-textarea{
     max-height: 60px;
 }
+.sheet-occ-skill-panel, .sheet-elective-skill-panel, 
+.sheet-secondary-skill-panel, .sheet-mystic-skill-panel{
+    max-width:710px;
+}
 .sheet-universalrow-grid-container{
     display:grid;
+    align-items:center;
     grid-template-columns: 30px 150px 50px 150px
 }
 .sheet-skill-grid-container{
     display:grid;
+    align-items:center;
     grid-template-columns: 30px 213px 50px 15px 50px 350px;
 }
 .sheet-skill-notes{
     width: 350px;
 }
+.sheet-melee-proficiency-panel{
+    padding-bottom:5px;
+    border-bottom:5px solid #aeb4bf;
+    max-width:460px;
+}
 .sheet-melee-grid-container{
     display:grid;
     grid-template-columns: 213px 50px 50px 50px 50px 50px
 }
+.sheet-ranged-proficiency-panel{
+    padding-top:5px;
+    padding-bottom:5px;
+    max-width:460px;
+}
 .sheet-ranged-grid-container{
     display:grid;
     grid-template-columns: 213px 50px 50px 50px 50px
 }
+.sheet-combat-skill-panel{
+    padding:5px;
+    border:5px solid #aeb4bf;
+    border-radius:10px;
+    max-width:525px;
+}
 .sheet-combat-grid-container{
     display:grid;
     grid-template-columns: 250px auto
@@ -254,28 +392,42 @@ div.sheet-body {
 }
 .sheet-bonus-grid-container{
     display:grid;
+    align-items:center;
     grid-template-columns: 150px 50px 130px 150px 50px
 }
 .sheet-bonus-field{
     width: 45px;
 }
+.sheet-saving-throw-panel{
+    padding-top:5px;
+}
 .sheet-saves-grid-container{
     display:grid;
-    grid-template-columns: 150px 50px 30px 100px 150px 50px 30px
+    align-items:center;
+    grid-template-columns: 150px 50px 30px 70px 150px 50px 30px
+}
+button[type=roll].sheet-savedice::before {
+    content: ''; 
 }
 .sheet-underline{
     text-decoration: underline;
 }
+.sheet-note-one-panel, .sheet-note-two-panel, .sheet-note-three-panel{
+    max-width:625px;
+}
 .sheet-notes-grid-container{
     display: grid;
+    align-items:center;
     grid-template-columns: 70px 213px auto
 }
 .sheet-second-notes-grid-container{
     display: grid;
+    align-items:center;
     grid-template-columns: 70px 213px auto
 }
 .sheet-third-notes-grid-container{
     display: grid;
+    align-items:center;
     grid-template-columns: 70px 213px auto
 }
 .sheet-notes-textarea{
@@ -514,4 +666,4 @@ div.sheet-body {
     color:#3f8aa6;
     display:inline;
     padding: 0
-}
\ No newline at end of file
+}
diff --git a/Palladium Fantasy 1E/palladium_fantasy_1e.html b/Palladium Fantasy 1E/palladium_fantasy_1e.html
index 5506b97b28..63c8514807 100644
--- a/Palladium Fantasy 1E/palladium_fantasy_1e.html	
+++ b/Palladium Fantasy 1E/palladium_fantasy_1e.html	
@@ -1,305 +1,227 @@
 <div class='background-panel'>
-<br>
-    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab1" value="1" title="Basic" checked="checked" /><span title="Basic"></span>
-    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab2" value="2" title="Equipment" /><span title="Equipment"></span>
-    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab3" value="3" title="Skills" /><span title="Skills"></span>
-    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab4" value="4" title="Combat" /><span title="Combat"></span>
-    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab5" value="5" title="Notes" /><span title="Notes"></span>
+    <br>
+
+    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab1" value="1" title="Statistics" checked="checked" /><span title="Statistics"></span>
+    <input type='radio' name='attr_tab1' class='sheet-tab sheet-tab2' value='2' title='Social' /><span title='Social'></span>
+    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab3" value="3" title="Equipment" /><span title="Equipment"></span>
+    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab4" value="4" title="Skills" /><span title="Skills"></span>
+    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab5" value="5" title="Combat" /><span title="Combat"></span>
+    <input type="radio" name="attr_tab1" class="sheet-tab sheet-tab6" value="6" title="Notes" /><span title="Notes"></span>
     
     <div class="sheet-tab-content sheet-tab1">
-        <h1>Character Statistics</h1>
-        <div class="stats-panel">
-            <div class='stats-grid-container' >
-                <h5 class='llabel'>Character Name</h5>
-                <input class='lstats' type="text" value="" name="attr_character_name"/>
-                <div class='space-holder'></div>
-                <h4 class='stat' >I.Q.</h4></span>
+        <h1>Statistics</h1>
+        <div class='name-grid-container'>
+            <h4 class='name-label' title='Character Name' >Name</h4>
+            <input class='name-stats' type='text' title='@{character_name}' value='' name='attr_character_name'/>
+            <h4 class='name-label' title='Character True Name' >True Name</h4>
+            <input class='name-stats' type='text' title='@{truename_name}' value='' name='attr_truename_name'/>
+        </div>
+        <div class='class-grid-container'>
+            <h4 class='class-label'title='Occupational Character Class' >O.C.C.</h4>
+            <input class='occ-stats' type='text' title='@{occ}' value='' name='attr_occ'/>
+            <h4 class='class-label' title='Character Level' >Level</h4>
+            <input class='class-stats' type='text' title='@{level}' value='' name='attr_level'/>
+            <h4 class='class-label' title='Experience Points' >Experience</h4>
+            <input class='exp-stats' type='text' title='@{experience}' value='' name='attr_experience'/>
+        </div>
+        <div class='middle-grid-container'>
+            <div class='blue-grid-container'>
+                <h4 class='stat-title'>Stat</h4>
+                <h4 class='stat-title'>Now/Past</h4>
+                <button class='statdice' type="roll" title='Intelligence Quotient' name='roll_iq_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=I.Q. Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{iq}}}" >I.Q.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_iq"/>
+                    <input class='minmax' type=text title='@{iq}' value='' name="attr_iq"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_iq_max"/>
+                    <input class='minmax' type=text title='@{iq_max}' value='' name="attr_iq_max"/>
                 </div>
-                <button class='statdice' type="roll" name='roll_iq_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=I.Q. Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{iq}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Hit Points</h5></span>
+                <button class='statdice' type="roll" title='Mental Endurance' name='roll_me_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Mental Endurance Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{me}}}" >M.E.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_character_hp"/>
+                    <input class='minmax' type=text title='@{me}' value='' name="attr_me"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_character_hp_max"/>
+                    <input class='minmax' type=text title='@{me_max}' value='' name="attr_me_max"/>
                 </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>True Name</h5>
-                <input class='lstats' type="text" value="" name="attr_truename_name"/>
-                <div class='space-holder'></div>
-                <h4 class='stat'>M.E.</h4>
+                <button class='statdice' type="roll" title='Mental Affinity' name='roll_ma_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Mental Affinity Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{ma}}}" >M.A.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_me"/>
+                    <input class='minmax' type=text title='@{ma}' value='' name="attr_ma"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_me_max"/>
+                    <input class='minmax' type=text title='@{ma_max}' value='' name="attr_ma_max"/>
                 </div>
-                <button class='statdice' type="roll" name='roll_me_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Mental Endurance Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{me}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>A.R.</h5>
+                <button class='statdice' type="roll" title='Physical Strength' name='roll_ps_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Strength Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{ps}}}" >P.S.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_character_ar"/>
+                    <input class='minmax' type=text title='@{ps}' value='' name="attr_ps"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_character_ar_max"/>
+                    <input class='minmax' type=text title='@{ps_max}' value='' name="attr_ps_max"/>
                 </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Race</h5>
-                <input class='lstats' type="text" value="" name="attr_character_race"/>
-                <div class='space-holder'></div>
-                <h4 class='stat'>M.A.</h4>
+                <button class='statdice' type="roll" title='Physical Prowess' name='roll_pp_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Prowess Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{pp}}}" >P.P.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_ma"/>
+                    <input class='minmax' type=text title='@{pp}' value='' name="attr_pp"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_ma_max"/>
+                    <input class='minmax' type=text title='@{pp_max}' value='' name="attr_pp_max"/>
                 </div>
-                <button class='statdice' type="roll" name='roll_ma_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Mental Affinity Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{ma}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>S.D.C.</h5>
+                <button class='statdice' type="roll" title='Physical Endurance' name='roll_pe_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Endurance Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{pe}}}" >P.E.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_character_sdc"/>
+                    <input class='minmax' type=text title='@{pe}' value='' name="attr_pe"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_character_sdc_max"/>
+                    <input class='minmax' type=text title='@{pe_max}' value='' name="attr_pe_max"/>
                 </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>O.C.C.</h5>
-                <input class='lstats' type="text" value="" name="attr_occ" />
-                <div class='space-holder'></div>
-                <h4 class='stat'>P.S.</h4>
+                <button class='statdice' type="roll" title='Physical Beauty' name='roll_pb_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Beauty Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{pb}}}" >P.B.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_ps"/>
+                    <input class='minmax' type=text title='@{pb}' value='' name="attr_pb"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_ps_max"/>
+                    <input class='minmax' type=text title='@{pb_max}' value='' name="attr_pb_max"/>
                 </div>
-                <button class='statdice' type="roll" name='roll_ps_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Strength Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{ps}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Psion Level</h5>
-                <input class='statnumber' type='text' value="0" name="attr_psi_level" />
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Level</h5>
-                <input class='lstats' type="text" name="attr_level" />
-                <div class='space-holder'></div>
-                <h4 class='stat'>P.P.</h4>
+                <button class='statdice' type="roll" title='Speed' name='roll_spd_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Speed Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{spd}}}" >Spd.</button>
                 <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_pp"/>
+                    <input class='minmax' type=text title='@{spd}' value='' name="attr_spd"/>
                     <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_pp_max"/>
+                    <input class='minmax' type=text title='@{spd_max}' value='' name="attr_spd_max"/>
                 </div>
-                <button class='statdice' type="roll" name='roll_pp_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Prowess Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{pp}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Psion I.S.P.</h5>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_character_pisp"/>
-                    <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_character_pisp_max"/>
-                </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Experience</h5>
-                <input class='lstats' type="text" name="attr_experience" />
-                <div class='space-holder'></div>
-                <h4 class='stat'>P.E.</h4>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_pe"/>
-                    <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_pe_max"/>
-                </div>
-                <button class='statdice' type="roll" name='roll_pe_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Endurance Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{pe}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Heal I.S.P.</h5>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_character_hisp"/>
-                    <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_character_hisp_max"/>
-                </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Alignment</h5>
-                <input class='lstats' type="text" name="attr_alignment" />
-                <div class='space-holder'></div>
-                <h4 class='stat'>P.B.</h4>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_pb"/>
-                    <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_pb_max"/>
-                </div>
-                <button class='statdice' type="roll" name='roll_pb_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Physical Beauty Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{pb}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Caster Level</h5>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type='text' value="0" name="attr_caster_level" />
-                    <div class='divider'></div>
-                    <input class='minmax' type='text' value="0" name="attr_caster_level_max" />
-                </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Age</h5>
-                <input class='lstats' type="text" value="" name="attr_character_age" />
-                <div class='space-holder'></div>
-                <h4 class='stat'>Spd</h4>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_spd"/>
-                    <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_spd_max"/>
-                </div>
-                <button class='statdice' type="roll" name='roll_spd_check' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Speed Check}} {{Check=[[1d20cs<1cf>20]]|[[1d100cs<1cf>100]]}} {{Target=@{spd}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Daily Casts</h5>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type=text value='' name="attr_character_casts"/>
-                    <div class='divider'></div>
-                    <input class='minmax' type=text value='' name="attr_character_casts_max"/>
-                </div>
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Gender</h5>
-                <input class='lstats' type="text" value="" name="attr_character_gender" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Lift</h5>
+            </div>
+            <div class='mid-column-gap'></div>
+            <div class='gold-grid-container'>
+                <h4 class='calc-title'>Autocalc</h4>
+                <h4 class='calc-title'>Stats</h4>
+                <h4 class='calc-label' title='Maximum Lift' >Lift lbs.</h4>
                 <input class='calc-field' type="text" value="" name="attr_lift" readonly>
-                <h6 class='mstats'>lbs</h6>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Spell Str</h5>
-                <div class='fraction-grid-container'>
-                    <input class='minmax' type='text' value="0" name="attr_spell_strength" />
-                    <div class='divider'></div>
-                    <input class='minmax' type='text' value="0" name="attr_spell_strength_max" />
-                </div>                
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Height</h5>
-                <input class='lstats' type="text" value="" name="attr_character_height" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Carry</h5>
+                <h4 class='calc-label' title='Maximum Carrying Weight' >Carry lbs.</h4>
                 <input class='calc-field' type="text" value="" name="attr_carry" readonly>
-                <h6 class='mstats'>lbs</h6>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Ward Level</h5>
-                <input class='statnumber' type='text' value="0" name="attr_ward_level" />
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Weight</h5>
-                <input class='lstats' type="text" value="" name="attr_character_weight" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Carry Max</h5>
+                <h4 class='calc-label' title='Time Between Rests at Max Carry Weight' >Carry Max</h4>
                 <input class='calc-field' type="text" value="" name="attr_carry_max" readonly>
-                <h6 class='mstats'>Min</h6>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Daily Wards</h5>
-                <input class='statnumber' type='text' value="" name="attr_ward_casts" />
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Family Origin</h5>
-                <input class='lstats' type="text" value="" name="attr_character_familyorigin" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Run</h5>
+                <h4 class='calc-label' title='Rounded Run Speed in Miles per Hour' >Run MPH</h4>
                 <input class='calc-field' type="text" value="" name="attr_run_mph" readonly>
-                <h6 class='mstats'>MPH</h6>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Ward Str</h5>
-                <input class='statnumber' type='text' value="0" name="attr_ward_strength" />
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Land of Origin</h5>
-                <input class='lstats' type="text" value="" name="attr_character_landorigin" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Run</h5>
+                <h4 class='calc-label' title='Maximum Feet of Movement per Melee' >Run/Melee</h4>
                 <input class='calc-field' type="text" value="" name="attr_run_melee" readonly>
-                <h6 class='mstats'>Ft/Melee</h6>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Circle Level</h5>
-                <input class='statnumber' type='text' value="0" name="attr_circle_level" />
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Native Language</h5>
-                <input class='lstats' type="text" value="" name="attr_character_languages" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Run</h5>
+                <h4 class='calc-label' title='Maximum Feet of Movement per Action' >Run/Action</h4>
                 <input class='calc-field' type="text" value="" name="attr_run_attack" readonly>
-                <h6 class='mstats'>Ft/Attack</h6>
-                <div class='space-holder'></div>
-                <h5 class='rlabel'>Circle Str</h5>
-                <input class='statnumber' type='text' value="0" name="attr_circle_strength" />
-                <div class='space-holder'></div>
-                
-                <h5 class='llabel'>Disposition</h5>
-                <input class='lstats' type="text" value="" name="attr_character_disposition" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Max Run</h5>
+                <h4 class='calc-label' title='Time Beween Rests When Running' >Run Minutes</h4>
                 <input class='calc-field' type="text" value="" name="attr_run_max" readonly>
-                <h6 class='mstats'>Min</h6>
-                <div class='space-holder'></div>
-                <h5 class='clabel'>Initiative</h5>
-                <input class='statnumber' type='text' value="0" name="attr_initiative_mod" />
-                <button class='cstats' type="roll" name='roll_initiative' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Initiative}} {{Initiative=[[d20+80+@{initiative_mod}&{tracker}]]}}" ></button>
-                
-                <h5 class='llabel'>Hostility</h5>
-                <input class='lstats' type="text" value="" name="attr_character_hostility" />
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Trust/Intim.</h5>
-                <input class='calc-field' type="text" value="0" name="attr_invoke_trust" readonly>
-                <button class='mstats' type="roll" name='roll_invoke_trust' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Trust or Intimidate Attempt}} {{Skill Check=[[1d100]]}} {{Chance of Success=@{invoke_trust}}}" ></button>               
-                <div class='space-holder'></div>
-                <h5 class='clabel'>Perception</h5>
-                <input class='statnumber' type='text' value="0" name="attr_perception" />
-                <button class='cstats' type="roll" name='roll_perception' value="&{template:custom} {{color=yellow}} {{title=**@{character_name}**}} {{subtitle=Perception}} {{Perception=[[d20cs<1cf>20+@{perception}]]}} {{desc=Target equal or below=[[floor((@{iq}+@{me})/2)]]}}" ></button>
-                
-                <h5 class='llabel'>Insanity</h5>
-                <input class='lstats' type="text" value="" name="attr_character_insanity" />    
-                <div class='space-holder'></div>
-                <h5 class='mlabel'>Charm/Impr.</h5>
-                <input class='calc-field' type="text" value="0" name="attr_charm_impress" readonly>
-                <button class='mstats' type="roll" name='roll_charm_impress' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Charm or Impress Attempt}} {{Skill Check=[[1d100]]}} {{Chance of Success=@{charm_impress}}}" ></button>
-                <div class='space-holder'></div>
-                <h5 class='clabel'>Dodge</h5>
-                <input class='statnumber' type='text' value="0" name="attr_temp_dodge"/>
-                <button class='cstats' type="roll" name='roll_dodge' value="&{template:custom} {{color=grey}} {{title=**@{character_name}**}} {{subtitle=Attempts to Dodge}} {{Dodge=[[1d20+@{hth_dodge}+@{pp_bonus}+?{Mounted?:|No, 0|Yes, @{hth_mountedparrydodge}}+@{temp_dodge}]]}} {{desc=Dodge takes the place of a remaining attack this round.}}" ></button>
+                <div class='spaceholder'></div>
+                <div class='spaceholder'></div>
+            </div>
+            <div class='mid-column-gap'></div>
+            <div class='ltblue-grid-container'>
+                <h4 class='roll-title'>Resources &</h4>
+                <h4 class='roll-title'>Rolls</h4>
+                <h4 class='roll-label' title='Hit Points' >Hit Points</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type='text' title='@{character_hp}' value='' name="attr_character_hp"/>
+                    <div class='divider'></div>
+                    <input class='minmax' type='text' title='@{character_hp_max}' value='' name="attr_character_hp_max"/>
+                </div>
+                <h4 class='roll-label' title='Armor Rating' >Armor Rating</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type='text' title='@{character_ar}' value='' name="attr_character_ar"/>
+                    <div class='divider'></div>
+                    <input class='minmax' type='text' title='@{character_ar_max}' value='' name="attr_character_ar_max"/>
+                </div>
+                <h4 class='roll-label' title='Armor Structural Damage Capacity' >Armor S.D.C.</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type='text' title='@{character_sdc}' value='' name="attr_character_sdc"/>
+                    <div class='divider'></div>
+                    <input class='minmax' type='text' title='@{character_sdc_max}' value='' name="attr_character_sdc_max"/>
+                </div>
+                <button class='rolldice' type="roll" title='Trust or Intimidate' name='roll_invoke_trust' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Trust or Intimidate Attempt}} {{Skill Check=[[1d100]]}} {{Chance of Success=@{invoke_trust}}}" >Trust</button>
+                <input class='roll-field' type="text" value="0" name="attr_invoke_trust" readonly>
+                <button class='rolldice' type="roll" title='Charm or Impress' name='roll_charm_impress' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Charm or Impress Attempt}} {{Skill Check=[[1d100]]}} {{Chance of Success=@{charm_impress}}}" >Charm</button>                
+                <input class='roll-field' type="text" value="0" name="attr_charm_impress" readonly>
+                <button class='rolldice' type="roll" title='Perception based on IQ and ME' name='roll_perception' value="&{template:custom} {{color=yellow}} {{title=**@{character_name}**}} {{subtitle=Perception}} {{Perception=[[d20cs<1cf>20+@{perception}]]}} {{desc=Target equal or below=[[floor((@{iq}+@{me})/2)]]}}" >Percep.</button>                
+                <input class='roll-field' type='text' title='Perception Bonus' value="0" name="attr_perception" />
+                <button class='rolldice' type="roll" title='Initiative (d20+80)' name='roll_initiative' value="&{template:custom} {{color=black}} {{title=**@{character_name}**}} {{subtitle=Initiative}} {{Initiative=[[d20+80+@{initiative_mod}&{tracker}]]}}" >Init.</button>                
+                <input class='roll-field' type='text' title='Initiative Bonus' value="0" name="attr_initiative_mod" />
+                <button class='rolldice' type="roll" title='Dodge' name='roll_dodge' value="&{template:custom} {{color=grey}} {{title=**@{character_name}**}} {{subtitle=Attempts to Dodge}} {{Dodge=[[1d20+@{hth_dodge}+@{pp_bonus}+?{Mounted?:|No, 0|Yes, @{hth_mountedparrydodge}}+@{temp_dodge}]]}} {{desc=Dodge takes the place of a remaining attack this round.}}" >Dodge</button>                
+                <input class='roll-field' type='text' title='Dodge Bonus Other Than HtH or PP' value="0" name="attr_temp_dodge"/>
+            </div>
+            <div class='mid-column-gap'></div>
+            <div class='caster-grid-container'>
+                <h4 class='caster-title'>Caster</h4>
+                <h4 class='caster-title'>Stats</h4>
+                <h4 class='caster-label' title='Psionic Level' >Psionic Lvl</h4>
+                <input class='caster-field' type='text' title='@{psi_level}' value="0" name="attr_psi_level"/>
+                <h4 class='caster-label' title='Psionic Inner Strength Points' >Psion I.S.P.</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type=text title='@{character_pisp}' value='' name="attr_character_pisp"/>
+                    <div class='divider'></div>
+                    <input class='minmax' type=text title='@{character_pisp_max}' value='' name="attr_character_pisp_max"/>
+                </div>
+                <h4 class='caster-label' title='Healer Inner Strength Points' >Healer I.S.P.</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type=text title='@{character_hisp}' value='' name="attr_character_hisp"/>
+                    <div class='divider'></div>
+                    <input class='minmax' type=text title='@{character_hisp_max}' value='' name="attr_character_hisp_max"/>
+                </div>
+                <h4 class='caster-label' title='Magic Caster Level' >Caster Lvl</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type='text' title='@{caster_level}' value="0" name="attr_caster_level" />
+                    <div class='divider'></div>
+                    <input class='minmax' type='text' title='@{caster_level_max}' value="0" name="attr_caster_level_max" />
+                </div>
+                <h4 class='caster-label' title='Daily Spell Casts' >Daily Casts</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type=text title='@{character_casts}' value='' name="attr_character_casts"/>
+                    <div class='divider'></div>
+                    <input class='minmax' type=text title='@{character_casts_max}' value='' name="attr_character_casts_max"/>
+                </div>
+                <h4 class='caster-label' title='Spell Strength' >Spell Str.</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type='text' title='@{spell_strength}' value="0" name="attr_spell_strength" />
+                    <div class='divider'></div>
+                    <input class='minmax' type='text' title='@{spell_strength_max}' value="0" name="attr_spell_strength_max" />
+                </div>
+                <h4 class='caster-label' title='Ward Level' >Ward Lvl</h4>
+                <input class='caster-field' type='text' title='@{ward_level}' value="0" name="attr_ward_level" />
+                <h4 class='caster-label' title='Daily Ward Activations' >Daily Wards</h4>
+                <div class='fraction-grid-container'>
+                    <input class='minmax' type='text' title='@{ward_casts}' value="" name="attr_ward_casts" />
+                    <div class='divider'></div>
+                    <input class='minmax' type='text' title='@{ward_casts_max}' value="" name="attr_ward_casts_max" />
+                </div>
+                <h4 class='caster-label' title='Ward Strength' >Ward Str.</h4>
+                <input class='caster-field' type='text' title=@{ward_strength} value="0" name="attr_ward_strength" />
+                <h4 class='caster-label' title='Circle Level' >Circle Lvl</h4>
+                <input class='caster-field' type='text' title='@{circle_level}' value="0" name="attr_circle_level" />
+                <h4 class='caster-label' title='Circle Strength' >Circle Str.</h4>
+                <input class='caster-field' type='text' title='@{circle_strength}' value="0" name="attr_circle_strength" />
             </div>
         </div>
-        <div class="leap-panel">
-            <h4>Movement</h4>
-            <div class='leap-grid-container' >
-                <div class='space-holder'></div>
-                <h5>Verticle</h5>
-                <h5>Horizontal</h5>
-                <div class='space-holder'></div>
-                <h5>Leaping Distance</h5>
-                <input type="number" name="attr_leapup" value="3" />
-                <input type="number" name="attr_leapout" value="4" />
-                <h6>Feet</h6>
-            </div>
-        </div>
-    	<div class="movement-panel">
-            <input type="checkbox" name="attr_addl_movement_toggle" class="sheet-arrow" />
-            <h4>Additional Movement</h4>            
-            <div class="body">
-                <div class='movement-grid-container' >
-                    <h5>Movement Type</h5>
-                    <h5>Speed</h5>
-                    <h5>MPH</h5>
-                    <h5>Ft/Melee</h5>
-                    <h5>Ft/Attack</h5>
-                    <h5>Max Run</h5>
-                    <div class='space-holder'></div>
+        <div class='movement-container'>
+            <div class="movement-panel">
+                <input type="checkbox" name="attr_addl_movement_toggle" class="sheet-arrow" />
+                <h4>Additional Movement</h4>
+                <div class="body">
+                    <div class="leap-panel">
+                        <div class='leap-grid-container' >
+                            <div class='space-holder'></div>
+                            <h5>Verticle</h5>
+                            <h5>Horizontal</h5>
+                            <div class='space-holder'></div>
+                            <h4>Leaping Distance</h4>
+                            <input class='leaping-field' type="number" name="attr_leapup" value="3" />
+                            <input class='leaping-field' type="number" name="attr_leapout" value="4" />
+                            <h4>Feet</h4>
+                        </div>
+                    </div>
+                    <div class='movement-grid-container' >
+                        <h5>Movement Type</h5>
+                        <h5>Speed</h5>
+                        <h5>MPH</h5>
+                        <h5>Run/Melee</h5>
+                        <h5>Run/Action</h5>
+                        <h5>Max Run</h5>
+                        <div class='space-holder'></div>
+                    </div>
                     <fieldset class="repeating_movement">
                         <div class='movement-grid-container' >
-                            <input type="text" value="" name="attr_movement_name" placeholder="Additional Movement Type" />
-                            <input type="number" value="" name="attr_movement_spd" />
-                            <input type="number" value="" name="attr_movement_mph" />
-                            <input type="number" value="" name="attr_movement_ft_melee" />
-                            <input type="number" value="" name="attr_movement_ft_attack" />
-                            <input type="number" value="" name="attr_movement_at_max" />
-                            <h6>minutes</h6>
+                            <input class='movement-field' type="text" value="" name="attr_movement_name" placeholder="Additional Movement Type" />
+                            <input class='movement-field' type="number" value="" name="attr_movement_spd" />
+                            <input class='movement-field' type="number" value="" name="attr_movement_mph" />
+                            <input class='movement-field' type="number" value="" name="attr_movement_ft_melee" />
+                            <input class='movement-field' type="number" value="" name="attr_movement_ft_attack" />
+                            <input class='movement-field' type="number" value="" name="attr_movement_at_max" />
+                            <h4>minutes</h4>
                         </div>
                     </fieldset>
-                </div>
-            </div>    
+                </div>    
+            </div>
         </div>
     	<div class="melee-attack-panel">
             <input type="checkbox" name="attr_melee_attacks-toggle" class="sheet-arrow" />
@@ -317,22 +239,22 @@
                     <h5>Damage</h5>
                     <h5>Temp</h5>
                     <h5>Notes</h5>
-                    <fieldset class="repeating_meleeattacks">
-                        <div class='mattack-grid-container' > 
-                            <input type="text" value="" name="attr_weapon_attack" placeholder="Weapon Name" />
-                            <button type="roll" name='roll_meleeattack' value="&{template:custom} {{color=blue}} {{title=**@{character_name}**}} {{subtitle=attacks with @{weapon_attack}}} {{Attack= [[d20cs>@{hth_critical}+@{weapon_strike}+@{hth_strike}+@{pp_bonus}+@{temp_strike}]]}} {{Damage= [[@{weapon_damage}+@{hth_damage}+@{ps_bonus}+@{temp_damage}]]}} {{desc=@{mattack_reference}}}"></button>
-                            <input type="number" value="0" name="attr_weapon_strike" />
-                            <input type="number" value="0" name="attr_temp_strike" />
-                            <button type="roll" name='roll_meleeparry' value="&{template:custom} {{color=grey}} {{title=**@{character_name}**}} {{subtitle=parries with @{weapon_attack}}} {{Parry= [[d20+@{weapon_parry}+@{hth_parry}+@{pp_bonus}+@{temp_parry}]]}}"></button>
-                            <input type="number" value="0" name="attr_weapon_parry" />
-                            <input type="number" value="0" name="attr_temp_parry" />
-                            <button type="roll" name='roll_meleedamage' value="&{template:custom} {{color=red}} {{title=**@{character_name}**}} {{subtitle=lashes out}} {{@{character_name}'s @{weapon_attack} deals= [[@{weapon_damage}+@{hth_damage}+@{ps_bonus}+@{temp_damage}]]}} {{desc=@{mattack_reference}}}"></button>
-                            <input class='damage-dice' type="text" value="" name="attr_weapon_damage" placeholder="xdy+z" />
-                            <input type="number" value="0" name="attr_temp_damage" />
-                            <input class='mattack-notes' type="text" value="" name="attr_mattack_reference" />
-                        </div>
-                    </fieldset>
                 </div>
+                <fieldset class="repeating_meleeattacks">
+                    <div class='mattack-grid-container' > 
+                        <input class='mattack-field' type="text" value="" name="attr_weapon_attack" placeholder="Weapon Name" />
+                        <button class='meleedice' type='roll' title='Strike (Attack) Roll with Damage' name='roll_meleeattack' value="&{template:custom} {{color=blue}} {{title=**@{character_name}**}} {{subtitle=attacks with @{weapon_attack}}} {{Attack= [[d20cs>@{hth_critical}+@{weapon_strike}+@{hth_strike}+@{pp_bonus}+@{temp_strike}]]}} {{Damage= [[@{weapon_damage}+@{hth_damage}+@{ps_bonus}+@{temp_damage}]]}} {{desc=@{mattack_reference}}}">S</button>
+                        <input class='mattack-field' type="number" title='Strike Bonuses other than HtH or PP' value="0" name="attr_weapon_strike" />
+                        <input class='mattack-field' type="number" title='Temporary Strike Bonuses' value="0" name="attr_temp_strike" />
+                        <button class='meleedice' type='roll' title='Parry Roll' name='roll_meleeparry' value="&{template:custom} {{color=grey}} {{title=**@{character_name}**}} {{subtitle=parries with @{weapon_attack}}} {{Parry= [[d20+@{weapon_parry}+@{hth_parry}+@{pp_bonus}+@{temp_parry}]]}}">P</button>
+                        <input class='mattack-field' type="number" title='Parry Bonuses other than HtH or PP' value="0" name="attr_weapon_parry" />
+                        <input class='mattack-field' type="number" title='Temporary Parry Bonuses' value="0" name="attr_temp_parry" />
+                        <button class='meleedice' type='roll' title='Damage Roll' name='roll_meleedamage' value="&{template:custom} {{color=red}} {{title=**@{character_name}**}} {{subtitle=lashes out}} {{@{character_name}'s @{weapon_attack} deals= [[@{weapon_damage}+@{hth_damage}+@{ps_bonus}+@{temp_damage}]]}} {{desc=@{mattack_reference}}}">D</button>
+                        <input class='damage-dice' type="text" title='Damage Dice Calculation other than HtH and PS' value="" name="attr_weapon_damage" placeholder="xdy+z" />
+                        <input class='mattack-field' type="number" title='Temporary Damage Bonuses' value="0" name="attr_temp_damage" />
+                        <input class='mattack-notes' type="text" title='Special Note About This Attack' value="" name="attr_mattack_reference" />
+                    </div>
+                </fieldset>
             </div>
         </div>
         <div class="ranged-attack-panel">
@@ -350,25 +272,60 @@
                     <h5>Range</h5>
                     <h5>RoF</h5>
                     <h5>Notes</h5>
-                    <fieldset class="repeating_rangedattacks"> 
-                        <div class='rattack-grid-container' >
-                            <input type="text" value="" name="attr_weapon_attack" placeholder="Weapon Name" />
-                            <button type="roll" name='roll_rangedattack' value="&{template:custom} {{color=blue}} {{title=**@{character_name}**}} {{subtitle=attacks with @{weapon_attack}}} {{Attack= [[d20cs>@{hth_ranged_critical}+@{weapon_strike}+@{temp_strike}]]}} {{Damage= [[@{weapon_damage}+@{temp_damage}]]}} {{desc=@{attack_reference}}}"></button>
-                            <input type="number" value="0" name="attr_weapon_strike" />
-                            <input type="number" value="0" name="attr_temp_strike" />
-                            <button type="roll" name='roll_rangeddamage' value="&{template:custom} {{color=red}} {{title=**@{character_name}**}} {{subtitle=hits with @{weapon_attack}}} {{@{character_name}'s @{weapon_attack} deals= [[@{weapon_damage}+@{temp_damage}]]}} {{desc=@{attack_reference}}}"></button>
-                            <input class='damage-dice' type="text" value="" name="attr_weapon_damage" placeholder="xdy+z" />
-                            <input type="number" value="0" name="attr_temp_damage" />
-                            <input type="number" value="" name="attr_weapon_range" />
-                            <input type="number" value="1" name="attr_weapon_rate_of_fire" />
-                            <input class='rattack-notes' type="text" value="" name="attr_attack_reference" />
-                        </div>
-                    </fieldset>
-                </div>         
+                </div>
+                <fieldset class="repeating_rangedattacks"> 
+                    <div class='rattack-grid-container' >
+                        <input class='rattack-field' type="text" value="" name="attr_weapon_attack" placeholder="Weapon Name" />
+                        <button class='rangeddice' type='roll' title='Strike (Attack) Roll with Damage' name='roll_rangedattack' value="&{template:custom} {{color=blue}} {{title=**@{character_name}**}} {{subtitle=attacks with @{weapon_attack}}} {{Attack= [[d20cs>@{hth_ranged_critical}+@{weapon_strike}+@{temp_strike}]]}} {{Damage= [[@{weapon_damage}+@{temp_damage}]]}} {{desc=@{attack_reference}}}">S</button>
+                        <input class='rattack-field' type="number" title='Bonuses to Strike' value="0" name="attr_weapon_strike" />
+                        <input class='rattack-field' type="number" title='Temporary Strike Bonuses' value="0" name="attr_temp_strike" />
+                        <button class='rangeddice' type='roll' title='Damage Roll Alone' name='roll_rangeddamage' value="&{template:custom} {{color=red}} {{title=**@{character_name}**}} {{subtitle=hits with @{weapon_attack}}} {{@{character_name}'s @{weapon_attack} deals= [[@{weapon_damage}+@{temp_damage}]]}} {{desc=@{attack_reference}}}">D</button>
+                        <input class='damage-dice' type="text" title='Damage Dice Calculation' value="" name="attr_weapon_damage" placeholder="xdy+z" />
+                        <input class='rattack-field' type="number" title='Temporary Damage Bonuses' value="0" name="attr_temp_damage" />
+                        <input class='rattack-field' type="number" title='Maximum Range of This Attack' value="" name="attr_weapon_range" />
+                        <input class='rattack-field' type="number" title='Rat of Fire per Melee' value="1" name="attr_weapon_rate_of_fire" />
+                        <input class='rattack-notes' type="text" title='Special Note About This Attack' value="" name="attr_attack_reference" />
+                    </div>
+                </fieldset>
             </div>
         </div>
     </div>
     <div class="sheet-tab-content sheet-tab2">
+        <h1>Social Information</h1>
+        <div class='physical-grid-container'>
+            <h4 class='physical-label'>Race</h4>
+            <h4 class='physical-label'>Age</h4>
+            <h4 class='physical-label'>Gender</h4>
+            <h4 class='physical-label'>Height</h4>
+            <h4 class='physical-label'>Weight</h4>
+            <input class='physical-field' type="text" value="" name="attr_character_race"/>
+            <input class='physical-field' type="text" value="" name="attr_character_age" />
+            <input class='physical-field' type="text" value="" name="attr_character_gender" />
+            <input class='physical-field' type="text" value="" name="attr_character_height" />
+            <input class='physical-field' type="text" value="" name="attr_character_weight" />
+        </div>
+        <div class='origin-grid-container'>
+            <h4 class='origin-label'>Alignment</h4>
+            <h4 class='origin-label'>Land of Origin</h4>
+            <h4 class='origin-label'>Native Language</h4>
+            <input class='physical-field' type="text" value='' name="attr_alignment" />
+            <input class='origin-field' type="text" value="" name="attr_character_landorigin" />
+            <input class='origin-field' type="text" value="" name="attr_character_languages" />
+        </div>
+        <div class='mental-grid-container'>
+            <h4 class='mental-label'>Family Origin</h4>
+            <textarea class='mental-field' value="" name="attr_character_familyorigin" placeholder='Family occupation, syblings, etc.' /></textarea>
+            <h4 class='mental-label'>Natural Abilities</h4>
+            <textarea class='mental-field' value="" name="attr_character_natural" placeholder='Racial, or story special abilities your character may have' /></textarea>
+            <h4 class='mental-label'>Disposition</h4>
+            <textarea class='mental-field' value="" name="attr_character_disposition" placeholder='Personality quirks and life outlook beyond alignment' /></textarea>
+            <h4 class='mental-label'>Hostilities</h4>
+            <textarea class='mental-field' value="" name="attr_character_hostility" placeholder='Hostilities, pet peeves, likes and dislikes' /></textarea>
+            <h4 class='mental-label'>Insanity</h4>
+            <textarea class='mental-field' value="" name="attr_character_insanity" placeholder='Hope this placeholder never gets replaced...' /></textarea>
+        </div>
+    </div>
+    <div class="sheet-tab-content sheet-tab3">
         <h1>Equipment</h1>
         <div class="weapon-inventory-panel">
             <input type="checkbox" name="attr_weapon-toggle" class="sheet-arrow" />
@@ -383,11 +340,11 @@
                         <h5>Value</h5>
                         <div class='space-holder'></div>
                         
-                        <input type="text" value="" name="attr_weapon_name" placeholder="Weapon Name" />
+                        <input class='weapon-field' type="text" value="" name="attr_weapon_name" placeholder="Weapon Name" />
                         <input class='damage-dice' type="text" value="" name="attr_weapon_weight" />
                         <input class='damage-dice' type="text" value="" name="attr_weapon_length" />
                         <input class='damage-dice' type="text" value="" name="attr_weapon_damage" placeholder="xdy+z" />
-                        <input type="number" value="" name="attr_weapon_value" />
+                        <input class='weapon-field' type="number" value="" name="attr_weapon_value" />
                         <div class='space-holder'></div>
                         <textarea wrap="soft" class="weapon-textarea" value="" name="attr_weapon_details" placeholder="Weapon Details" /></textarea>
                     </div>            
@@ -407,11 +364,11 @@
                         <h5>Value</h5>
                         <div class='space-holder'></div>
                         
-                        <input type="text" value="" name="attr_armor_name" placeholder="Armor Name" />
-                        <input type="number" value="" name="attr_armor_ar" />
-                        <input type="number" value="" name="attr_armor_sdc" />
+                        <input class='armor-field' type="text" value="" name="attr_armor_name" placeholder="Armor Name" />
+                        <input class='armor-field' type="number" value="" name="attr_armor_ar" />
+                        <input class='armor-field' type="number" value="" name="attr_armor_sdc" />
                         <input class='damage-dice' type="text" value="" name="attr_armor_weight" />
-                        <input class="sheet-input-center-aligned" type="number" value="" name="attr_armor_value" />
+                        <input class='armor-field' type="number" value="" name="attr_armor_value" />
                         <div class='space-holder'></div>
                         <textarea wrap="soft" class='armor-textarea' value="" name="attr_armor_details" placeholder="Armor Details" /></textarea>
                     </div>            
@@ -429,9 +386,9 @@
                         <h5>Location</h5>
                         <div class='space-holder'></div>
                         
-                        <input type="text" value="" name="attr_wealth_name" placeholder="Gear Name" />
-                        <input type="text" value="" name="attr_wealth_worth" placeholder="Book and page numbers"/>
-                        <input type="text" value="" name="attr_wealth_location" placeholder="Worn, pouch, bank, etc." />
+                        <input class='gear-field' type="text" value="" name="attr_wealth_name" placeholder="Gear Name" />
+                        <input class='gear-field' type="text" value="" name="attr_wealth_worth" placeholder="Book and page numbers"/>
+                        <input class='gear-field' type="text" value="" name="attr_wealth_location" placeholder="Worn, pouch, bank, etc." />
                         <div class='space-holder'></div>
                         <textarea wrap="soft" class='inventory-textarea' value="" name="attr_wealth_details" placeholder="Gear details, if any" /></textarea>
                     </div>            
@@ -449,16 +406,16 @@
                         <h5>Location</h5>
                         <div class='space-holder'></div>
                         
-                        <input type="text" value="" name="attr_wealth_name" placeholder="Consumable Name" />
-                        <input type="text" value="" name="attr_wealth_worth" placeholder="Book and page numbers"/>
-                        <input type="text" value="" name="attr_wealth_location" placeholder="Worn, pouch, bank, etc." />
+                        <input class='consumable-field' type="text" value="" name="attr_wealth_name" placeholder="Consumable Name" />
+                        <input class='consumable-field' type="text" value="" name="attr_wealth_worth" placeholder="Book and page numbers"/>
+                        <input class='consumable-field' type="text" value="" name="attr_wealth_location" placeholder="Worn, pouch, bank, etc." />
                         <div class='space-holder'></div>
                         <textarea wrap="soft" class='inventory-textarea' value="" name="attr_wealth_details" placeholder="Consumable details, if any" /></textarea>
                     </div>            
                 </fieldset>
             </div>
         </div>
-        <div class="sheet-tabbed-panel">
+        <div class="wealth-inventory-panel">
             <input type="checkbox" name="attr_wealth-toggle" class="sheet-arrow" />
             <h4>Wealth</h4>
             <div class="body">
@@ -469,9 +426,9 @@
                         <h5>Location</h5>
                         <div class='space-holder'></div>
                         
-                        <input type="text" value="" name="attr_wealth_name" placeholder="Salary, cash, valuable, etc" />
-                        <input type="text" value="" name="attr_wealth_worth" placeholder="Value"/>
-                        <input type="text" value="" name="attr_wealth_location" placeholder="Wallet, pouch, bank, etc." />
+                        <input class='wealth-field' type="text" value="" name="attr_wealth_name" placeholder="Salary, cash, valuable, etc" />
+                        <input class='wealth-field' type="text" value="" name="attr_wealth_worth" placeholder="Value"/>
+                        <input class='wealth-field' type="text" value="" name="attr_wealth_location" placeholder="Wallet, pouch, bank, etc." />
                         <div class='space-holder'></div>
                         <textarea wrap="soft" class='inventory-textarea' value="" name="attr_wealth_details" placeholder="Wealth item details, if any" /></textarea>
                     </div>            
@@ -479,7 +436,7 @@
             </div>
         </div>
     </div>
-    <div class="sheet-tab-content sheet-tab3">
+    <div class="sheet-tab-content sheet-tab4">
         <h1>Skills</h1>
         <div class='universalrow-grid-container'>
             <button type="roll" name='roll_skill' value="&{template:custom} {{color=green}} {{title=**@{character_name}}} {{subtitle=?{What Skill?|No Reason}}} {{Check=[[1d100]]-@{iq_bonus}}}" ></button> 
@@ -493,7 +450,7 @@
             <div class="body">
                 <div class='skill-grid-container' >
                     <div class='space-holder'></div>
-                    <h5>Name</h5>
+                    <h5>Skill Name</h5>
                     <h5>Rating</h5>
                     <div class='percent-space'></div>
                     <h5>Skill Lvl</h5>
@@ -501,11 +458,11 @@
                 </div>
                 <fieldset class="repeating_skillocc">
     	            <div class='skill-grid-container' >
-    		            <button type="roll" name='roll_occskill' value="&{template:custom} {{color=green}} {{title=**@{character_name}'s**}} {{subtitle=@{skill_name}}} {{Check=[[d100cs<1cf>100-@{iq_bonus}]]}} {{Skill=@{skill_rating}}} {{desc=@{skill_reference}}}"></button>
-    		            <input type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
-    		            <input type="number" value="" name="attr_skill_rating" />
+    	                <button type="roll" name='roll_occskill' value="&{template:custom} {{color=green}} {{title=**@{character_name}'s**}} {{subtitle=@{skill_name}}} {{Check=[[d100cs<1cf>100-@{iq_bonus}]]}} {{Skill=@{skill_rating}}} {{desc=@{skill_reference}}}"></button>
+    	                <input class='occ-field' type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
+    		            <input class='occ-field' type="number" title='Total Skill Percentage Rating' value="" name="attr_skill_rating" />
     		            <h6>%</h6>
-    		            <input type="number" value="1" name="attr_skill_level" />
+    		            <input class='occ-field' type="number" title='Skill Level' value="1" name="attr_skill_level" />
     		            <input class="skill-notes" type="text" value="" name="attr_skill_reference" />
     	            </div>
                 </fieldset>
@@ -526,10 +483,10 @@
                 <fieldset class="repeating_skillelective">
     	            <div class='skill-grid-container' >
     		            <button type="roll" name='roll_electiveskill' value="&{template:custom} {{color=green}} {{title=**@{character_name}'s**}} {{subtitle=@{skill_name}}} {{Check=[[d100cs<1cf>100-@{iq_bonus}]]}} {{Skill=@{skill_rating}}} {{desc=@{skill_reference}}}"></button>
-    		            <input type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
-    		            <input type="number" value="" name="attr_skill_rating" />
+    		            <input class='elective-field' type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
+    		            <input class='elective-field' type="number" title='Total Skill Percentage Rating' value="" name="attr_skill_rating" />
     		            <h6>%</h6>
-    		            <input type="number" value="1" name="attr_skill_level" />
+    		            <input class='elective-field' type="number" title='Skill Level' value="1" name="attr_skill_level" />
     		            <input class="skill-notes" type="text" value="" name="attr_skill_reference" />
     	            </div>
                 </fieldset>
@@ -550,10 +507,10 @@
                 <fieldset class="repeating_skillsecondary">
     	            <div class='skill-grid-container' >
     		            <button type="roll" name='roll_secondaryskill' value="&{template:custom} {{color=green}} {{title=**@{character_name}'s**}} {{subtitle=@{skill_name}}} {{Check=[[d100cs<1cf>100-@{iq_bonus}]]}} {{Skill=@{skill_rating}}} {{desc=@{skill_reference}}}"></button>
-    		            <input type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
-    		            <input type="number" value="" name="attr_skill_rating" />
+    		            <input class='secondary-field' type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
+    		            <input class='secondary-field' type="number" title='Total Skill Percentage Rating' value="" name="attr_skill_rating" />
     		            <h6>%</h6>
-    		            <input type="number" value="1" name="attr_skill_level" />
+    		            <input class='secondary-field' type="number" title='Skill Level' value="1" name="attr_skill_level" />
     		            <input class="skill-notes" type="text" value="" name="attr_skill_reference" />
     	            </div>
                 </fieldset>
@@ -574,17 +531,17 @@
                 <fieldset class="repeating_skillmystic">
     	            <div class='skill-grid-container' >
     		            <button type="roll" name='roll_mysticskill' value="&{template:custom} {{color=green}} {{title=**@{character_name}'s**}} {{subtitle=@{skill_name}}} {{Check=[[d100cs<1cf>100]]}} {{Skill=@{skill_rating}}} {{desc=@{skill_reference}}}"></button>
-    		            <input type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
-    		            <input type="number" value="" name="attr_skill_rating" />
+    		            <input class='mystic-field' type="text" value="" name="attr_skill_name" placeholder="Skill name"/>
+    		            <input class='mystic-field' type="number" title='Total Skill Percentage Rating' value="" name="attr_skill_rating" />
     		            <h6>%</h6>
-    		            <input type="number" value="1" name="attr_skill_level" />
+    		            <input class='mystic-field' type="number" title='Skill Level' value="1" name="attr_skill_level" />
     		            <input class="skill-notes" type="text" value="" name="attr_skill_reference" />
     	            </div>
                 </fieldset>
             </div>
         </div>
     </div>
-    <div class="sheet-tab-content sheet-tab4">
+    <div class="sheet-tab-content sheet-tab5">
         <h1>Combat</h1>
         <div class="melee-proficiency-panel">
             <input type="checkbox" name="attr_melee_weapon-toggle" class="sheet-arrow" />
@@ -597,17 +554,17 @@
                     <h5>Parry</h5>
                     <h5>Throw</h5>
                     <h5>Range</h5>
-                    <fieldset class="repeating_weaponmelee">
-                        <div class='melee-grid-container' >
-                            <input class="sheet-input-center-aligned" type="text" value="" name="attr_melee_weapon_name" placeholder="Weapon Type" />
-                            <input class="sheet-input-center-aligned" type="number" value="1" name="attr_melee_weapon_skill_level" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_melee_weapon_strike" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_melee_weapon_parry" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_melee_weapon_throw" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_melee_weapon_range" />
-                        </div>
-                    </fieldset>
                 </div>
+                <fieldset class="repeating_weaponmelee">
+                    <div class='melee-grid-container' >
+                        <input class='melee-field' type="text" value="" name="attr_melee_weapon_name" placeholder="Weapon Type" />
+                        <input class='melee-field' type="number" title='Proficiency Skill Level' value="1" name="attr_melee_weapon_skill_level" />
+                        <input class='melee-field' type="number" title='Proficiency Strike Bonus' value="0" name="attr_melee_weapon_strike" />
+                        <input class='melee-field' type="number" title='Proficiency Parry Bonus' value="0" name="attr_melee_weapon_parry" />
+                        <input class='melee-field' type="number" title='Proficiency Throw Bonus' value="0" name="attr_melee_weapon_throw" />
+                        <input class='melee-field' type="number" title='Proficiency Throw Range (if any)' value="0" name="attr_melee_weapon_range" />
+                    </div>
+                </fieldset>
             </div>
         </div>
         <div class="ranged-proficiency-panel">
@@ -620,16 +577,16 @@
                     <h5>Strike</h5>
                     <h5>RoF</h5>
                     <h5>Range</h5>
-                    <fieldset class="repeating_rangedmelee">
-                        <div class='ranged-grid-container' >
-                            <input class="sheet-input-center-aligned" type="text" value="" name="attr_ranged_weapon_name" placeholder="Weapon Type" />
-                            <input class="sheet-input-center-aligned" type="number" value="1" name="attr_ranged_weapon_skill_level" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_ranged_weapon_strike" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_ranged_weapon_parry" />
-                            <input class="sheet-input-center-aligned" type="number" value="0" name="attr_ranged_weapon_range" />
-                        </div>
-                    </fieldset>
                 </div>
+                <fieldset class="repeating_rangedmelee">
+                    <div class='ranged-grid-container' >
+                        <input class='ranged-field' type="text" value="" name="attr_ranged_weapon_name" placeholder="Weapon Type" />
+                        <input class='ranged-field' type="number" title='Proficiency Skill Level' value="1" name="attr_ranged_weapon_skill_level" />
+                        <input class='ranged-field' type="number" title='Proficiency Strike Bonus' value="0" name="attr_ranged_weapon_strike" />
+                        <input class='ranged-field' type="number" title='Proficiency Rate of Fire' value="0" name="attr_ranged_weapon_parry" />
+                        <input class='ranged-field' type="number" title='Proficiency Max Firing Distance' value="0" name="attr_ranged_weapon_range" />
+                    </div>
+                </fieldset>
             </div>
         </div>    
         <div class="combat-skill-panel">
@@ -637,44 +594,44 @@
             <h4>Hand to Hand Combat Skill</h4>
             <div class="body">
                 <div class='combat-grid-container' >
-                    <input type="text" class='combat-text' name="attr_combatskill_type" placeholder="Combat Type" />
+                    <input class='combat-field' type="text" class='combat-text' name="attr_combatskill_type" placeholder="Combat Type" />
                     <div class='space-holder'></div>
                     <div class='space-holder'></div>
-                    <textarea wrap="soft" class="combat-textarea" value="" placeholder="Style Details" /></textarea>
+                    <textarea wrap="soft" class="combat-textarea" value="" placeholder="Style Details like kick attack, disarms, racial bite or claw attacks, etc." /></textarea>
                 </div>
                 <div class='bonus-grid-container' >
                     <h5>Combat Skill Level</h5>
-                    <input type="number" name="attr_hth_level" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_level" value="0" />
                     <div class='space-holder'></div>
                     <h5>Number of Attacks</h5>
-                    <input type="number" name="attr_hth_numberattacks" value="1" />
+                    <input class='combat-field' type="number" name="attr_hth_numberattacks" value="1" />
                     <h5>Strike</h5>
-                    <input type="number" name="attr_hth_strike" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_strike" value="0" />
                     <div class='space-holder'></div>
                     <h5>Damage</h5>
-                    <input type="number" name="attr_hth_damage" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_damage" value="0" />
                     <h5>Parry</h5>
-                    <input type="number" name="attr_hth_parry" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_parry" value="0" />
                     <div class='space-holder'></div>
                     <h5>Dodge</h5>
-                    <input type="number" name="attr_hth_dodge" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_dodge" value="0" />
                     <h5>Mounted Damage</h5>
-                    <input type="number" name="attr_hth_mounteddamage" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_mounteddamage" value="0" />
                     <div class='space-holder'></div>
                     <h5>Charge Damage</h5>
-                    <input type="number" name="attr_hth_chargedamage" value="0" />                    
+                    <input class='combat-field' type="number" name="attr_hth_chargedamage" value="0" />                    
                     <h5>Mounted Parry/Dodge</h5>
-                    <input type="number" name="attr_hth_mountedparrydodge" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_mountedparrydodge" value="0" />
                     <div class='space-holder'></div>
                     <h5>Disarm</h5>
-                    <input type="number" name="attr_hth_disarm" value="0" />
+                    <input class='combat-field' type="number" name="attr_hth_disarm" value="0" />
                     <h5>Knockout/Stun</h5>
-                    <input type="number" name="attr_hth_knockout" value="none" />
+                    <input class='combat-field' type="number" name="attr_hth_knockout" value="none" />
                     <div class='space-holder'></div>
                     <h5>Critical Strike</h5>
-                    <input type="number" name="attr_hth_critical" value="20" />
+                    <input class='combat-field' type="number" name="attr_hth_critical" value="20" />
                     <h5>Ranged Critical Strike</h5>
-                    <input type="number" name="attr_hth_ranged_critical" value="20" />
+                    <input class='combat-field' type="number" name="attr_hth_ranged_critical" value="20" />
                     <div class='space-holder'></div>
                     <div class='space-holder'></div>
                     <div class='space-holder'></div>
@@ -688,55 +645,58 @@
         </div>
         <div class="saving-throw-panel">
             <input type="checkbox" name="attr_saves-toggle" class="sheet-arrow" />
-            <h4>Saves</h4>
+            <h4>Saving Throws</h4>
             <div class="body">
                 <div class='saves-grid-container' >
-                    <h5 class='underline'>Save Type</h5>
+                    <h5 class='underline'>Magic Save Type</h5>
+                    <h5 class='underline'>Target</h5>
                     <h5 class='underline'>Bonus</h5>
                     <div class='space-holder'></div>
-                    <div class='space-holder'></div>
                     <h5 class='underline'>Save Type</h5>
+                    <h5 class='underline'>Target</h5>
                     <h5 class='underline'>Bonus</h5>
+                    <button class='savedice' type="roll" name='roll_circlesave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Circles}} {{Save=[[d20+@{save_circle}+@{pe_magpois}]]}} {{Target= @{save_circle-target}}}" >Circles</button>
+                    <input class='save-field' type="number" value="14" name="attr_save_circle-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_circle" />
                     <div class='space-holder'></div>
-                    <h5>Circle Magic (<input type="number" value="14" name="attr_save_circle-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_circle" />
-                    <button type="roll" name='roll_circlesave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Circles}} {{Save=[[d20+@{save_circle}+@{pe_magpois}]]}} {{Target= @{save_circle-target}}}" ></button>
-                    <div class='space-holder'></div>
-                    <h5>Insanity (<input type="number" value="12" name="attr_save_insanity-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_insane" />
-                    <button type="roll" name='roll_insanitysave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Insanity}} {{Save=[[d20+@{save_insane}+@{me_insanity}]]}} {{Target= @{save_insanity-target}}}" ></button>                   
+                    <button class='savedice' type="roll" name='roll_insanitysave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Insanity}} {{Save=[[d20+@{save_insane}+@{me_insanity}]]}} {{Target= @{save_insanity-target}}}" >Insanity</button>
+                    <input class='save-field' type="number" value="12" name="attr_save_insanity-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_insane" />
+                                       
                     
-                    <h5>Fume Magic (<input type="number" value="14" name="attr_save_fumes-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_fumes" />
-                    <button type="roll" name='roll_fumesave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Fumes}} {{Save=[[d20+@{save_fumes}+@{pe_magpois}]]}} {{Target= @{save_fumes-target}}}" ></button>
+                    <button class='savedice' type="roll" name='roll_fumesave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Fumes}} {{Save=[[d20+@{save_fumes}+@{pe_magpois}]]}} {{Target= @{save_fumes-target}}}" >Fumes</button>
+                    <input class='save-field' type="number" value="14" name="attr_save_fumes-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_fumes" />
                     <div class='space-holder'></div>
-                    <h5>Psionics (<input type="number" value="15" name="attr_save_psi-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_psi" />
-                    <button type="roll" name='roll_psionicsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Psionics}} {{Save=[[d20+@{save_psi}+@{me_psionic}]]}} {{Target= @{save_psi-target}}}" ></button>
+                    <button class='savedice' type="roll" name='roll_psionicsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Psionics}} {{Save=[[d20+@{save_psi}+@{me_psionic}]]}} {{Target= @{save_psi-target}}}" >Psionics</button>
+                    <input class='save-field' type="number" value="15" name="attr_save_psi-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_psi" />
                     
-                    <h5>Spell Magic (<input type="number" value="12" name="attr_save_spells-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_spells" />
-                    <button type="roll" name='roll_spellsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Spells}} {{Save=[[d20+@{save_spells}+@{pe_magpois}]]}} {{Target= @{save_spells-target}}}" ></button>
-                    <div class='space-holder'></div>
-                    <h5>Soul Drinking (<input type="number" value="14" name="attr_save_souldrink-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_souldrinking" />
-                    <button type="roll" name='roll_soulsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Souldrinking}} {{Save=[[d20+@{save_souldrinking}+@{pe_magpois}]]}} {{Target= @{save_souldrink-target}}}" ></button>
                     
-                    <h5>Ward Magic (<input type="number" value="14" name="attr_save_wards-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_wards" />
-                    <button type="roll" name='roll_wardsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Wards}} {{Save=[[d20+@{save_wards}+@{pe_magpois}]]}} {{Target= @{save_wards-target}}}" ></button>
+                    <button class='savedice' type="roll" name='roll_spellsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Spells}} {{Save=[[d20+@{save_spells}+@{pe_magpois}]]}} {{Target= @{save_spells-target}}}" >Spells</button>
+                    <input class='save-field' type="number" value="12" name="attr_save_spells-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_spells" />
                     <div class='space-holder'></div>
-                    <h5>Coma/Death</h5>
-                    <input type="number" value="0" name="attr_save_comadeath" />
-                    <button type="roll" name='roll_deathsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}'s**}} {{subtitle=Save vs. Coma/Death}} {{Save 1=[[d100+@{save_comadeath}+@{pe_coma}]]}} {{Save 2=[[d100+@{save_comadeath}+@{pe_coma}]]}} {{Save 3=[[d100+@{save_comadeath}+@{pe_coma}]]}} {{desc=**Roll 3 times each hour and need 2 successes.** Target is 59 with normal treatment, or 31 with magical treatment.}}" ></button>
+                    <button class='savedice' type="roll" name='roll_soulsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Souldrinking}} {{Save=[[d20+@{save_souldrinking}+@{pe_magpois}]]}} {{Target= @{save_souldrink-target}}}" >Soul Drink</button>
+                    <input class='save-field' type="number" value="14" name="attr_save_souldrink-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_souldrinking" />
+                    
+                    
+                    <button class='savedice' type="roll" name='roll_wardsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Wards}} {{Save=[[d20+@{save_wards}+@{pe_magpois}]]}} {{Target= @{save_wards-target}}}" >Wards</button>
+                    <input class='save-field' type="number" value="14" name="attr_save_wards-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_wards" />
+                    <div class='space-holder'></div>
+                    <button class='savedice' type="roll" name='roll_poisonsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Poison}} {{Save=[[d20+@{save_poison}+@{pe_magpois}]]}} {{Target= @{save_poison-target}}}" >Poison</button>
+                    <input class='save-field' type="number" value="14" name="attr_save_poison-target" />
+                    <input class='save-field' type="number" value="0" name="attr_save_poison" />
                     
-                    <h5>Poison (<input type="number" value="14" name="attr_save_poison-target" />)</h5>
-                    <input type="number" value="0" name="attr_save_poison" />
-                    <button type="roll" name='roll_poisonsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}**}} {{subtitle=Save vs. Poison}} {{Save=[[d20+@{save_poison}+@{pe_magpois}]]}} {{Target= @{save_poison-target}}}" ></button>
                     <div class='space-holder'></div>
                     <div class='space-holder'></div>
                     <div class='space-holder'></div>
+                    <div class='space-holder'></div>                    
+                    <button class='savedice' type="roll" name='roll_deathsave' value="&{template:custom} {{color=brown}} {{title=**@{character_name}'s**}} {{subtitle=Save vs. Coma/Death}} {{Save 1=[[d100+@{save_comadeath}+@{pe_coma}]]}} {{Save 2=[[d100+@{save_comadeath}+@{pe_coma}]]}} {{Save 3=[[d100+@{save_comadeath}+@{pe_coma}]]}} {{desc=**Roll 3 times each hour and need 2 successes.** Target is 59 with normal treatment, or 31 with magical treatment.}}" >Coma/Death</button>
                     <div class='space-holder'></div>
+                    <input class='save-field' type="number" value="0" name="attr_save_comadeath" />
                     
                     <h5>PE Save Bonus</h5>
                     <input class='bonus-field' type="text" value="" name="attr_pe_magpois" readonly>
@@ -757,7 +717,7 @@
             </div>
         </div>
     </div>
-    <div class="sheet-tab-content sheet-tab5">
+    <div class="sheet-tab-content sheet-tab6">
         <h1>Notes</h1>
         <div class="note-one-panel">
             <input type="checkbox" name="attr_notes-toggle" class="sheet-arrow" />
@@ -766,7 +726,7 @@
                 <fieldset class="repeating_notes"> 
                     <div class='notes-grid-container' >
                         <h4>Notes On</h4>
-                        <input type="text" value="" name="attr_notes_title" placeholder="Place, Person, or Topic" />
+                        <input class='notes-field' type="text" value="" name="attr_notes_title" placeholder="Place, Person, or Topic" />
                         <div class="place-holder"></div>
                         <textarea wrap="soft" class='notes-textarea' value="" name="attr_notes_area" placeholder="Note Details" /></textarea>
                     </div>            
@@ -780,7 +740,7 @@
                 <fieldset class="repeating_notes2"> 
                     <div class='second-notes-grid-container' >
                         <h4>Notes On</h4>
-                        <input type="text" value="" name="attr_notes_title" placeholder="Place, Person, or Topic" />
+                        <input class='notes-field' type="text" value="" name="attr_notes_title" placeholder="Place, Person, or Topic" />
                         <div class="place-holder"></div>
                         <textarea wrap="soft" class='notes-textarea' value="" name="attr_notes_area" placeholder="Note Details" /></textarea>
                     </div>            
@@ -794,7 +754,7 @@
                 <fieldset class="repeating_notes3"> 
                     <div class='third-notes-grid-container' >
                         <h4>Notes On</h4>
-                        <input type="text" value="" name="attr_notes_title" placeholder="Place, Person, or Topic" />
+                        <input class='notes-field' type="text" value="" name="attr_notes_title" placeholder="Place, Person, or Topic" />
                         <div class="place-holder"></div>
                         <textarea wrap="soft" class='notes-textarea' value="" name="attr_notes_area" placeholder="Note Details" /></textarea>
                     </div>            
@@ -964,4 +924,4 @@
       {{#desc}}<div class="sheet-desc">{{desc}}</div>{{/desc}}
     </div>
   </div>
-</rolltemplate>
\ No newline at end of file
+</rolltemplate>
diff --git a/Palladium Fantasy 1E/palladium_fantasy_1e.png b/Palladium Fantasy 1E/palladium_fantasy_1e.png
deleted file mode 100644
index 2a6eb1d4b0..0000000000
Binary files a/Palladium Fantasy 1E/palladium_fantasy_1e.png and /dev/null differ
diff --git a/Palladium Fantasy 1E/sheet.json b/Palladium Fantasy 1E/sheet.json
index 49e6e6a76d..bb461b10d5 100644
--- a/Palladium Fantasy 1E/sheet.json	
+++ b/Palladium Fantasy 1E/sheet.json	
@@ -3,6 +3,6 @@
 	"css": "palladium_fantasy_1e.css",
 	"authors": "Kraynic",
 	"roll20userid": "1869955",
-	"preview": "palladium_fantasy_1e.png",
+	"preview": "palladium_sheet-tab1.png",
 	"instructions": "\n For more info on the sheet see the github [ReadMe](https://github.com/Roll20/roll20-character-sheets/blob/master/Palladium%20Fantasy%201E/ReadMe.md), or the Roll20 [wiki page](https://wiki.roll20.net/Palladium_Fantasy_1E) \n* For issues with or questions about the sheet, contact the [current editor](https://app.roll20.net/users/1869955)"
 }