diff --git a/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html b/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
index 412a61e5b1..1eaa056816 100644
--- a/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
+++ b/Fallout-Vaults-and-Deathclaws/Fallout-VnV.html
@@ -13,7 +13,7 @@
         <h3 style="width:98%">Character Information</h3>
         <div class="sheet-bio">
         <div>
-            <input type="text" class="sheet-text_left" name="attr_titlecharacter_name" value="Name" readonly />&nbsp;<input type="text" class="sheet-number" name="attr_character_name" style="width: 26%"/>
+            <input type="text" class="sheet-text_left" name="attr_titlecharacter_name" value="Name" readonly />&nbsp;<input type="text" class="sheet-number" name="attr_character_name" style="width: 76%"/>
         </div>
         <div> 
             <input type="text" class="sheet-text_left" name="attr_titlecharacter_size" value="Size" readonly />&nbsp;<input type="text" class="sheet-text_right" name="attr_character_size"  />
@@ -479,7 +479,7 @@
             <input type="text" class="sheet-number_skill" name="attr_basetext-sneak" value="5 + AGI + AGI" readonly />
         </div>
         <div>
-            <button class="sheet-skill_button" type='roll' name="attr_roll-survival" value="&{template:default} {{name=@{character_name}}} {{Survial=[[[[@{survival}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
+            <button class="sheet-skill_button" type='roll' name="attr_roll-survival" value="&{template:default} {{name=@{character_name}}} {{Survival=[[[[@{survival}]] + [[?{Skill Mod|0}]] - [[1d100]] ]]}}" /></button>
             <input type="text" class="sheet-text_skillname" value="Survival" readonly />
             <input name="attr_tagskill28" value="1" type="checkbox">&nbsp;&nbsp;
             <input type="number" class="sheet-number" name="attr_survival" value="@{mod-survival} + @{base-survival} + 20*@{tagskill28}+ @{temp-survival}" disabled="true"/>
@@ -499,6 +499,12 @@
                 <div class="sheet-tab-br"></div>
                 <div class='sheet-2colrow'>
                     <div class='sheet-col'>
+                        <div>
+                            <input type="text" class="sheet-text_damage" value="AP" readonly style="width:20%"/>
+                            <input type="number" class="sheet-number" name="attr_ap-current" value="0" style="width:23%"/>
+                            <input type="number" class="sheet-number" name="attr_ap-max" value="0" style="width:23%"/>
+                            <input type="number" class="sheet-number" name="attr_ap-temp" value="0" style="width:23%"/>
+                        </div>
                         <div>
                             <input type="text" class="sheet-text_damage" value="HP" readonly style="width:20%"/>
                             <input type="number" class="sheet-number" name="attr_hit_points-current" value="0" style="width:23%"/>
@@ -535,24 +541,8 @@
                             <input type="checkbox" name="attr_failure_2" value="1" class="sheet-bigcheck"/><span></span>
                             <input type="checkbox" name="attr_failure_3" value="1" class="sheet-bigcheck"/><span></span>
                         </div>
-                        <div> 
-                            <input type="text" class="sheet-text_damage" value="SQ" readonly style="width:25%"/>
-                            <button type="roll" class="sheet-skill_button" name="attr_sequence_roll" value="&{template:default} {{name=@{character_name}}} {{Sequence=[[[[@{sequence}]] + [[?{Sequence Mod|0}]] + [[1d10]] &{tracker}]]}}"></button>
-                        </div>
                     </div>
                     <div class='sheet-col'>
-                        <div>
-                            <input type="text" class="sheet-text_damage" value="AP" readonly style="width:20% ; color : #00FFFF"/>
-                            <input type="number" class="sheet-number" name="attr_action_points" value="0" style="background: #00FFFF"/>
-                            <input type="text" class="sheet-text_damage" value="FTG" readonly style="width:20% ; color : #BE9ED4"/>
-                            <input type="number" class="sheet-number" style="background: #BE9ED4" name="attr_fatigue" value="0" />
-                        </div>
-                        <div>
-                            <input type="text" class="sheet-text_damage" value="NV" readonly style="width:20% ; color : #FFFFFF"/>
-                            <input type="number" class="sheet-number" name="attr_night_vision" value="0" style="background: #FFFFFF"/>
-                            <input type="text" class="sheet-text_damage" value="Rad" readonly style="width:20% ; color: limegreen"/>
-                            <input type="number" class="sheet-number" name="attr_condition-rad" value='0' style="background:limegreen"/>
-                        </div>
                         <div>
                             <input type="text" class="sheet-text_damage" value="Head" readonly style="width:30%"/>
                             <input type="checkbox" name="attr_cripple_head" value="1" class="sheet-bigcheck"/><span></span>
@@ -577,6 +567,24 @@
                             <input type="text" class="sheet-text_damage" value="R" readonly style="width:10%"/>
                             <input type="checkbox" name="attr_cripple_right_leg" value="1" class="sheet-bigcheck"/><span></span>
                         </div>
+                        <div>
+                            <input type="text" class="sheet-text_damage" value="Fatigue" readonly style="width:45%"/>
+                            <select class ="sheet-select" name="attr_fatigue_count" value="0" style="width:30%">
+                            <option value="0">0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            </select>
+                        </div>
+                        <div>
+                            <input type="text" class="sheet-text_damage" value="Rad" readonly style="width:20% ; color: limegreen"/>
+                            <input type="number" class="sheet-number" name="attr_condition-rad" value='0' style="background:limegreen"/>
+                            <input type="text" class="sheet-text_damage" value="SQ" readonly style="width:25%"/>
+                            <button type="roll" class="sheet-skill_button" name="attr_sequence_roll" value="&{template:default} {{name=@{character_name}}} {{Sequence=[[[[@{sequence}]] + [[?{Sequence Mod|0}]] + [[1d10]] &{tracker}]]}}"></button>
+                        </div>
                     </div>
                     </div>
                         <div>
@@ -587,8 +595,8 @@
                             Result
                             <button type='roll' class="sheet-skill_button" name="attr_damage_calc"  value="/em takes [[ceil(([[[[@{damage_val} - @{damage_dt}]]]]))]] Damage"></button>
                         </div>
-                <div>
-                    <textarea style="width:90%" name="attr_wounds_note" placeholder="Other Conditions"></textarea>
+                    <div>
+                    <textarea style="width:90%" name="attr_wounds_note" placeholder="Other Effects"></textarea>
                 </div>
             </div>
         </div> 
@@ -598,27 +606,13 @@
         <div class="sheet-tab-br"></div>
             <div>
                 <input type="text" class="sheet-text_damage" value="HLM" readonly style="width:15%"/>
-                <input type="text" class="sheet-number" name="attr_helmet_name" style="width:50%"/>
-                <input type="text" class="sheet-text_damage" value="CM" readonly style="width:10%"/>
-                <select class ="sheet-select" name="attr_helmet_condition-num" value="0" style="width:10%">
-                    <option value="0"></option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
-                    <option value="5">5</option>
-                    <option value="6">6</option>
-                    <option value="7">7</option>
-                    <option value="8">8</option>
-                    <option value="9">9</option>
-                    <option value="10">10</option>
-                </select>
+                <input type="text" class="sheet-number" name="attr_helmet_name" style="width:30%"/>
+                <input type="text" class="sheet-text_damage" value="UA" readonly style="width:15%"/>
+                <input type="text" class="sheet-number" name="attr_underarmor_name" style="width:30%"/>
             </div>
         <div>
-            <input type="text" class="sheet-text_damage" value="UA" readonly style="width:10%"/>
-            <input type="text" class="sheet-number" name="attr_underarmor_name" style="width:37%"/>
             <input type="text" class="sheet-text_damage" value="AS" readonly style="width:10%"/>
-            <input type="text" class="sheet-number" name="attr_armorset_name" style="width:37%"/>
+            <input type="text" class="sheet-number" name="attr_armorset_name" style="width:82%"/>
         </div>
             <div>
                 <input type="text" class="sheet-text_damage" value="" readonly style="width:10%"/>
@@ -710,50 +704,6 @@
                 <input type="number" class="sheet-number" name="attr_damage_threshold_hlm-rr" value="0" style="width:10%"/>
                 <input type="number" class="sheet-number" name="attr_damage_threshold_mod-rr" value="0" style="width:10%"/>
             </div>
-            <div>
-                <input type="text" class="sheet-text_damage" value="UA CM" readonly style="width:15%"/>
-                <select class ="sheet-select" name="attr_underarmor_condition-num" value="0" style="width:10%">
-                    <option value="0"></option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
-                    <option value="5">5</option>
-                    <option value="6">6</option>
-                    <option value="7">7</option>
-                    <option value="8">8</option>
-                    <option value="9">9</option>
-                    <option value="10">10</option>
-                </select>
-                <input type="text" class="sheet-text_damage" value="AS CM" readonly style="width:15%"/>
-                <select class ="sheet-select" name="attr_armor_condition-num" value="0" style="width:10%">
-                    <option value="0"></option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
-                    <option value="5">5</option>
-                    <option value="6">6</option>
-                    <option value="7">7</option>
-                    <option value="8">8</option>
-                    <option value="9">9</option>
-                    <option value="10">10</option>
-                </select>
-                <input type="text" class="sheet-text_damage" value="PA CM" readonly style="width:15%"/>
-                <select class ="sheet-select" name="attr_powerarmor_condition-num" value="0" style="width:10%">
-                    <option value="0"></option>
-                    <option value="1">1</option>
-                    <option value="2">2</option>
-                    <option value="3">3</option>
-                    <option value="4">4</option>
-                    <option value="5">5</option>
-                    <option value="6">6</option>
-                    <option value="7">7</option>
-                    <option value="8">8</option>
-                    <option value="9">9</option>
-                    <option value="10">10</option>
-                </select>
-            </div>
             <div>
                 <textarea style="width:90%" name="attr_armor_note" placeholder="Armor Notes"></textarea>
             </div>
@@ -804,30 +754,15 @@
                     <input type="number" class="sheet-number" name="attr_weapon_targeted-1" style="width:3%"/>
                     <input type="text" class="sheet-text_damage" value="B" readonly style="width:2%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_burst-1" style="width:3%"/>
-                    <input type="text" class="sheet-text_damage" value="R" readonly style="width:2%"/>
+                    <input type="text" class="sheet-text_damage" value="R" readonly style="width:3%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_reload-1" style="width:3%"/>
-                    
                     <input type="text" class="sheet-text_damage" value="Capacity" readonly style="width:8%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_ammo-1" style="width:5%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_ammo-2" style="width:5%"/>
-                    <input type="text" class="sheet-text_damage" value="CM" readonly style="width:4%"/>
-                    <select class ="sheet-select" name="attr_weapon_condition-1" value="0" style="width:6%">
-                        <option value="0"></option>
-                        <option value="1">1</option>
-                        <option value="2">2</option>
-                        <option value="3">3</option>
-                        <option value="4">4</option>
-                        <option value="5">5</option>
-                        <option value="6">6</option>
-                        <option value="7">7</option>
-                        <option value="8">8</option>
-                        <option value="9">9</option>
-                        <option value="10">10</option>
-                    </select>
-                        <input type="text" class="sheet-text_damage" value="AC" readonly style="width:4%"/>
-                        <input type="number" class="sheet-number" name="attr_ac_reduction-1" style="width:5%"/>
-                        <input type="text" class="sheet-text_damage" value="DT" readonly style="width:4%"/>
-                        <input type="number" class="sheet-number" name="attr_dt_reduction-1" style="width:5%"/>
+                    <input type="text" class="sheet-text_damage" value="AC" readonly style="width:4%"/>
+                    <input type="number" class="sheet-number" name="attr_ac_reduction-1" style="width:5%"/>
+                    <input type="text" class="sheet-text_damage" value="DT" readonly style="width:4%"/>
+                    <input type="number" class="sheet-number" name="attr_dt_reduction-1" style="width:5%"/>
                     <input type="text" class="sheet-text_damage" value="Equipped" readonly style="width:8%"/>
                     <input type="checkbox" name="attr_equip-1" value="1" class="sheet-bigcheck"/><span></span>
                 </div>
@@ -882,30 +817,15 @@
                     <input type="number" class="sheet-number" name="attr_weapon_targeted-2" style="width:3%"/>
                     <input type="text" class="sheet-text_damage" value="B" readonly style="width:2%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_burst-2" style="width:3%"/>
-                    <input type="text" class="sheet-text_damage" value="R" readonly style="width:2%"/>
+                    <input type="text" class="sheet-text_damage" value="R" readonly style="width:3%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_reload-2" style="width:3%"/>
-                    
                     <input type="text" class="sheet-text_damage" value="Capacity" readonly style="width:8%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_ammo-3" style="width:5%"/>
                     <input type="number" class="sheet-number" name="attr_weapon_ammo-4" style="width:5%"/>
-                    <input type="text" class="sheet-text_damage" value="CM" readonly style="width:4%"/>
-                    <select class ="sheet-select" name="attr_weapon_condition-2" value="0" style="width:6%">
-                        <option value="0"></option>
-                        <option value="1">1</option>
-                        <option value="2">2</option>
-                        <option value="3">3</option>
-                        <option value="4">4</option>
-                        <option value="5">5</option>
-                        <option value="6">6</option>
-                        <option value="7">7</option>
-                        <option value="8">8</option>
-                        <option value="9">9</option>
-                        <option value="10">10</option>
-                    </select>
-                        <input type="text" class="sheet-text_damage" value="AC" readonly style="width:4%"/>
-                        <input type="number" class="sheet-number" name="attr_ac_reduction-2" style="width:5%"/>
-                        <input type="text" class="sheet-text_damage" value="DT" readonly style="width:4%"/>
-                        <input type="number" class="sheet-number" name="attr_dt_reduction-2" style="width:5%"/>
+                    <input type="text" class="sheet-text_damage" value="AC" readonly style="width:4%"/>
+                    <input type="number" class="sheet-number" name="attr_ac_reduction-2" style="width:5%"/>
+                    <input type="text" class="sheet-text_damage" value="DT" readonly style="width:4%"/>
+                    <input type="number" class="sheet-number" name="attr_dt_reduction-2" style="width:5%"/>
                     <input type="text" class="sheet-text_damage" value="Equipped" readonly style="width:8%"/>
                     <input type="checkbox" name="attr_equip-2" value="1" class="sheet-bigcheck"/><span></span>
                 </div>