diff --git a/M-Space/Changelog.md b/M-Space/Changelog.md
index f07b833a0a..cfaaae8132 100644
--- a/M-Space/Changelog.md
+++ b/M-Space/Changelog.md
@@ -7,6 +7,11 @@ Versions have three numbers Major.Minor.Release
 
 **Release**: Indicates bugfixes and minor UI changes only.
 
+## 1.5.1
+### Bugfixes
+* Minor re-arrangement of fields
+* Fixed rounding error in NPC rolls
+
 ## 1.5.0
 ### New Features
 * Added NPC sheet with JSON importer
diff --git a/M-Space/M-Space.html b/M-Space/M-Space.html
index 865f565494..2ee3f7d3e3 100644
--- a/M-Space/M-Space.html
+++ b/M-Space/M-Space.html
@@ -282,8 +282,16 @@
             <div>
                 <div class="ship-label"><span data-i18n="ship-name-u" class="bold">Ship Name</span>:</div>
                 <div class="ship-field"><input type="text" class="full-width" name="attr_character_name"></div>
-                <div class="ship-label"><span data-i18n="captain-u" class="bold">Captain</span>:</div>
-                <div class="ship-field"><input type="text" class="full-width" name="attr_ship_captain"></div>
+                <div class="ship-label"><span data-i18n="condition-u" class="bold">Condition</span>:</div>
+                <div class="ship-field">
+                    <select class="full-width" name="attr_ship_condition">
+                        <option value="ship_shape" selected><span data-i18n="ship-shape-u" class="bold">Ship Shape</span></option>
+                        <option value="seaworthy"><span data-i18n="seaworthy-u" class="bold">Seaworthy</span></option>
+                        <option value="battered"><span data-i18n="battered-u" class="bold">Battered</span></option>
+                        <option value="swamped"><span data-i18n="swamped-u" class="bold">Swamped</span></option>
+                        <option value="sinking"><span data-i18n="sinking-u" class="bold">Sinking</span></option>
+                    </select>
+                </div>
             </div>
             <div>
                 <div class="ship-label"><span data-i18n="size-u" class="bold">Size</span>:</div>
@@ -321,14 +329,13 @@
             <div>
                 <div class="ship-label"><span data-i18n="seaworthiness-u" class="bold">Seaworthiness</span>:</div>
                 <div class="ship-field"><span data-i18n="penalty-short-u">Pen</span>:<input type="number" name="attr_ship_seaworthiness_penalty" max="0" value="0">&nbsp;%:<input type="number" name="attr_ship_seaworthiness" value="0">&nbsp;<button type="roll" class="reduced-size" name="roll_seaworthiness" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=^{seaworthiness-u}}} @{name_display} {{very_easy=[[(@{ship_seaworthiness}*2+@{ship_seaworthiness_penalty})]]}} {{very_easy_crit=[[ceil(((@{ship_seaworthiness}*2)+@{ship_seaworthiness_penalty})*.1)]]}}  {{easy=[[ceil((@{ship_seaworthiness}*1.5)+@{ship_seaworthiness_penalty})]]}} {{easy_crit=[[ceil(((@{ship_seaworthiness}*1.5)+@{ship_seaworthiness_penalty})*.1)]]}}  {{standard=[[(@{ship_seaworthiness}+@{ship_seaworthiness_penalty})]]}} {{standard_crit=[[ceil((@{ship_seaworthiness}+@{ship_seaworthiness_penalty})*.1)]]}}  {{hard=[[ceil((@{ship_seaworthiness}*.67)+@{ship_seaworthiness_penalty})]]}} {{hard_crit=[[ceil(((@{ship_seaworthiness}*.67)+@{ship_seaworthiness_penalty})*.1)]]}}  {{formidable=[[ceil((@{ship_seaworthiness}*.5)+@{ship_seaworthiness_penalty})]]}} {{formidable_crit=[[ceil(((@{ship_seaworthiness}*.5)+@{ship_seaworthiness_penalty})*.1)]]}}  {{herculean=[[ceil((@{ship_seaworthiness}*.1)+@{ship_seaworthiness_penalty})]]}} {{herculean_crit=[[ceil(((@{ship_seaworthiness}*.1)+@{ship_seaworthiness_penalty})*.1)]]}}  {{rolled=[[1d100]]}}  {{encumbered=[[1]]}} {{encumbrance_skills=[[@{encumbrance_skills}]]}} {{fatigue_skills=[[0]]}} {{ship_condition_skills=[[@{ship_condition_skills}]]}}"></div>
-                <div class="ship-label"><span data-i18n="condition-u" class="bold">Condition</span>:</div>
+                <div class="ship-label"><span data-i18n="skill-modifier-u" class="bold">Skill Modifier</span>:</div>
                 <div class="ship-field">
-                    <select class="full-width" name="attr_ship_condition">
-                        <option value="ship_shape" selected><span data-i18n="ship-shape-u" class="bold">Ship Shape</span></option>
-                        <option value="seaworthy"><span data-i18n="seaworthy-u" class="bold">Seaworthy</span></option>
-                        <option value="battered"><span data-i18n="battered-u" class="bold">Battered</span></option>
-                        <option value="swamped"><span data-i18n="swamped-u" class="bold">Swamped</span></option>
-                        <option value="sinking"><span data-i18n="sinking-u" class="bold">Sinking</span></option>
+                    <select class="full-width disabled" name="attr_ship_condition_skills">
+                        <option value="1" selected><span data-i18n="standard-u" class="bold">Standard</span></option>
+                        <option value="2"><span data-i18n="hard-u" class="bold">Hard</span></option>
+                        <option value="3"><span data-i18n="formidable-u" class="bold">Formidable</span></option>
+                        <option value="4"><span data-i18n="herculean-u" class="bold">Herculean</span></option>
                     </select>
                 </div>
             </div>
@@ -354,17 +361,6 @@
                 <div class="ship-label"><span data-i18n="range-u" class="bold">Range</span>:</div>
                 <div class="ship-field"><input type="number" name="attr_ship_range" value="ceil((@{ship_seaworthiness}/10)-@{ship_condition_range})" disabled></div>
             </div>
-            <div>
-                <div class="ship-label"><span data-i18n="skill-modifier-u" class="bold">Skill Modifier</span>:</div>
-                <div class="ship-field">
-                    <select class="full-width disabled" name="attr_ship_condition_skills">
-                        <option value="1" selected><span data-i18n="standard-u" class="bold">Standard</span></option>
-                        <option value="2"><span data-i18n="hard-u" class="bold">Hard</span></option>
-                        <option value="3"><span data-i18n="formidable-u" class="bold">Formidable</span></option>
-                        <option value="4"><span data-i18n="herculean-u" class="bold">Herculean</span></option>
-                    </select>
-                </div>
-            </div>
         </div>
         
         <!-- Ship Weapons -->
@@ -554,6 +550,12 @@
                     </div>
                 </div>
                 
+                <!-- NPC Traits -->
+                <div class="npc-characteristics section">
+                    <div><span class="bold" data-i18n="traits-abilities-gifts-u">Traits / Abilities / Gifts</span>:</div>
+                    <div><textarea class="npc-traits" name="attr_npc_traits"></textarea></div>
+                </div>
+                
                 <div style="width: 700px; float: left;">
                     <!-- NPC Attributes -->
                     <div class="npc-attributes section">
@@ -762,12 +764,6 @@
                         </div>
                     </div>
                     
-                    <!-- NPC Traits -->
-                    <div class="npc-characteristics section">
-                        <div><span class="bold" data-i18n="traits-abilities-gifts-u">Traits / Abilities / Gifts</span>:</div>
-                        <div><textarea class="npc-traits" name="attr_npc_traits"></textarea></div>
-                    </div>
-                    
                     <!-- NPC Combat Styles -->
                     <div class="npc-skill section">
                         <div>
@@ -781,7 +777,7 @@
                                 <div class="npc-skill-name"><input type="text" class="full-width" name="attr_name"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_penalty" max="0" value="0"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_total" value="0"></div>
-                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_combatstyle" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[((@{total}*2)+@{penalty})]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[((@{total}*1.5)+@{penalty})]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
+                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_combatstyle" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[ceil(((@{total}*2)+@{penalty}))]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[ceil(((@{total}*1.5)+@{penalty}))]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
                             </div>
                         </fieldset>
                     </div>
@@ -799,7 +795,7 @@
                                 <div class="npc-skill-name"><input type="text" class="full-width" name="attr_name"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_penalty" max="0" value="0"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_total" value="0"></div>
-                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_passion" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[((@{total}*2)+@{penalty})]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[((@{total}*1.5)+@{penalty})]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
+                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_passion" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[ceil(((@{total}*2)+@{penalty}))]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[ceil(((@{total}*1.5)+@{penalty}))]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
                             </div>
                         </fieldset>
                     </div>
@@ -846,7 +842,7 @@
                                 <div class="npc-skill-name"><input type="text" class="full-width" name="attr_name"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_penalty" max="0" value="0"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_total" value="0"></div>
-                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_skill" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[((@{total}*2)+@{penalty})]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[((@{total}*1.5)+@{penalty})]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
+                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_skill" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[ceil((@{total}*2)+@{penalty}))]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[ceil(((@{total}*1.5)+@{penalty}))]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
                             </div>
                         </fieldset>
                     </div>
@@ -4692,6 +4688,11 @@
                 setAttrs({version: "1.5.0"});
                 versioning();
             }
+            else if(v["version"] === "1.5.0") {
+                console.log("upgrading to v1.5.1");
+                setAttrs({version: "1.5.1"});
+                versioning();
+            }
             else {
                 console.log("Sheet fully updated");
             }
diff --git a/Mythras/Changelog.md b/Mythras/Changelog.md
index f07b833a0a..cfaaae8132 100644
--- a/Mythras/Changelog.md
+++ b/Mythras/Changelog.md
@@ -7,6 +7,11 @@ Versions have three numbers Major.Minor.Release
 
 **Release**: Indicates bugfixes and minor UI changes only.
 
+## 1.5.1
+### Bugfixes
+* Minor re-arrangement of fields
+* Fixed rounding error in NPC rolls
+
 ## 1.5.0
 ### New Features
 * Added NPC sheet with JSON importer
diff --git a/Mythras/Mythras.html b/Mythras/Mythras.html
index fc4fabcb43..7c349710f0 100644
--- a/Mythras/Mythras.html
+++ b/Mythras/Mythras.html
@@ -282,8 +282,16 @@
             <div>
                 <div class="ship-label"><span data-i18n="ship-name-u" class="bold">Ship Name</span>:</div>
                 <div class="ship-field"><input type="text" class="full-width" name="attr_character_name"></div>
-                <div class="ship-label"><span data-i18n="captain-u" class="bold">Captain</span>:</div>
-                <div class="ship-field"><input type="text" class="full-width" name="attr_ship_captain"></div>
+                <div class="ship-label"><span data-i18n="condition-u" class="bold">Condition</span>:</div>
+                <div class="ship-field">
+                    <select class="full-width" name="attr_ship_condition">
+                        <option value="ship_shape" selected><span data-i18n="ship-shape-u" class="bold">Ship Shape</span></option>
+                        <option value="seaworthy"><span data-i18n="seaworthy-u" class="bold">Seaworthy</span></option>
+                        <option value="battered"><span data-i18n="battered-u" class="bold">Battered</span></option>
+                        <option value="swamped"><span data-i18n="swamped-u" class="bold">Swamped</span></option>
+                        <option value="sinking"><span data-i18n="sinking-u" class="bold">Sinking</span></option>
+                    </select>
+                </div>
             </div>
             <div>
                 <div class="ship-label"><span data-i18n="size-u" class="bold">Size</span>:</div>
@@ -321,14 +329,13 @@
             <div>
                 <div class="ship-label"><span data-i18n="seaworthiness-u" class="bold">Seaworthiness</span>:</div>
                 <div class="ship-field"><span data-i18n="penalty-short-u">Pen</span>:<input type="number" name="attr_ship_seaworthiness_penalty" max="0" value="0">&nbsp;%:<input type="number" name="attr_ship_seaworthiness" value="0">&nbsp;<button type="roll" class="reduced-size" name="roll_seaworthiness" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=^{seaworthiness-u}}} @{name_display} {{very_easy=[[(@{ship_seaworthiness}*2+@{ship_seaworthiness_penalty})]]}} {{very_easy_crit=[[ceil(((@{ship_seaworthiness}*2)+@{ship_seaworthiness_penalty})*.1)]]}}  {{easy=[[ceil((@{ship_seaworthiness}*1.5)+@{ship_seaworthiness_penalty})]]}} {{easy_crit=[[ceil(((@{ship_seaworthiness}*1.5)+@{ship_seaworthiness_penalty})*.1)]]}}  {{standard=[[(@{ship_seaworthiness}+@{ship_seaworthiness_penalty})]]}} {{standard_crit=[[ceil((@{ship_seaworthiness}+@{ship_seaworthiness_penalty})*.1)]]}}  {{hard=[[ceil((@{ship_seaworthiness}*.67)+@{ship_seaworthiness_penalty})]]}} {{hard_crit=[[ceil(((@{ship_seaworthiness}*.67)+@{ship_seaworthiness_penalty})*.1)]]}}  {{formidable=[[ceil((@{ship_seaworthiness}*.5)+@{ship_seaworthiness_penalty})]]}} {{formidable_crit=[[ceil(((@{ship_seaworthiness}*.5)+@{ship_seaworthiness_penalty})*.1)]]}}  {{herculean=[[ceil((@{ship_seaworthiness}*.1)+@{ship_seaworthiness_penalty})]]}} {{herculean_crit=[[ceil(((@{ship_seaworthiness}*.1)+@{ship_seaworthiness_penalty})*.1)]]}}  {{rolled=[[1d100]]}}  {{encumbered=[[1]]}} {{encumbrance_skills=[[@{encumbrance_skills}]]}} {{fatigue_skills=[[0]]}} {{ship_condition_skills=[[@{ship_condition_skills}]]}}"></div>
-                <div class="ship-label"><span data-i18n="condition-u" class="bold">Condition</span>:</div>
+                <div class="ship-label"><span data-i18n="skill-modifier-u" class="bold">Skill Modifier</span>:</div>
                 <div class="ship-field">
-                    <select class="full-width" name="attr_ship_condition">
-                        <option value="ship_shape" selected><span data-i18n="ship-shape-u" class="bold">Ship Shape</span></option>
-                        <option value="seaworthy"><span data-i18n="seaworthy-u" class="bold">Seaworthy</span></option>
-                        <option value="battered"><span data-i18n="battered-u" class="bold">Battered</span></option>
-                        <option value="swamped"><span data-i18n="swamped-u" class="bold">Swamped</span></option>
-                        <option value="sinking"><span data-i18n="sinking-u" class="bold">Sinking</span></option>
+                    <select class="full-width disabled" name="attr_ship_condition_skills">
+                        <option value="1" selected><span data-i18n="standard-u" class="bold">Standard</span></option>
+                        <option value="2"><span data-i18n="hard-u" class="bold">Hard</span></option>
+                        <option value="3"><span data-i18n="formidable-u" class="bold">Formidable</span></option>
+                        <option value="4"><span data-i18n="herculean-u" class="bold">Herculean</span></option>
                     </select>
                 </div>
             </div>
@@ -354,17 +361,6 @@
                 <div class="ship-label"><span data-i18n="range-u" class="bold">Range</span>:</div>
                 <div class="ship-field"><input type="number" name="attr_ship_range" value="ceil((@{ship_seaworthiness}/10)-@{ship_condition_range})" disabled></div>
             </div>
-            <div>
-                <div class="ship-label"><span data-i18n="skill-modifier-u" class="bold">Skill Modifier</span>:</div>
-                <div class="ship-field">
-                    <select class="full-width disabled" name="attr_ship_condition_skills">
-                        <option value="1" selected><span data-i18n="standard-u" class="bold">Standard</span></option>
-                        <option value="2"><span data-i18n="hard-u" class="bold">Hard</span></option>
-                        <option value="3"><span data-i18n="formidable-u" class="bold">Formidable</span></option>
-                        <option value="4"><span data-i18n="herculean-u" class="bold">Herculean</span></option>
-                    </select>
-                </div>
-            </div>
         </div>
         
         <!-- Ship Weapons -->
@@ -554,6 +550,12 @@
                     </div>
                 </div>
                 
+                <!-- NPC Traits -->
+                <div class="npc-characteristics section">
+                    <div><span class="bold" data-i18n="traits-abilities-gifts-u">Traits / Abilities / Gifts</span>:</div>
+                    <div><textarea class="npc-traits" name="attr_npc_traits"></textarea></div>
+                </div>
+                
                 <div style="width: 700px; float: left;">
                     <!-- NPC Attributes -->
                     <div class="npc-attributes section">
@@ -762,12 +764,6 @@
                         </div>
                     </div>
                     
-                    <!-- NPC Traits -->
-                    <div class="npc-characteristics section">
-                        <div><span class="bold" data-i18n="traits-abilities-gifts-u">Traits / Abilities / Gifts</span>:</div>
-                        <div><textarea class="npc-traits" name="attr_npc_traits"></textarea></div>
-                    </div>
-                    
                     <!-- NPC Combat Styles -->
                     <div class="npc-skill section">
                         <div>
@@ -781,7 +777,7 @@
                                 <div class="npc-skill-name"><input type="text" class="full-width" name="attr_name"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_penalty" max="0" value="0"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_total" value="0"></div>
-                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_combatstyle" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[((@{total}*2)+@{penalty})]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[((@{total}*1.5)+@{penalty})]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
+                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_combatstyle" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[ceil(((@{total}*2)+@{penalty}))]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[ceil(((@{total}*1.5)+@{penalty}))]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
                             </div>
                         </fieldset>
                     </div>
@@ -799,7 +795,7 @@
                                 <div class="npc-skill-name"><input type="text" class="full-width" name="attr_name"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_penalty" max="0" value="0"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_total" value="0"></div>
-                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_passion" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[((@{total}*2)+@{penalty})]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[((@{total}*1.5)+@{penalty})]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
+                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_passion" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[ceil(((@{total}*2)+@{penalty}))]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[ceil(((@{total}*1.5)+@{penalty}))]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
                             </div>
                         </fieldset>
                     </div>
@@ -846,7 +842,7 @@
                                 <div class="npc-skill-name"><input type="text" class="full-width" name="attr_name"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_penalty" max="0" value="0"></div>
                                 <div class="npc-skill-number"><input type="number" class="full-width" name="attr_total" value="0"></div>
-                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_skill" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[((@{total}*2)+@{penalty})]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[((@{total}*1.5)+@{penalty})]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
+                                <div class="npc-skill-button"><button type="roll" class="reduced-size full-width" name="roll_skill" value="@{roll_display}&{template:skill} {{show_reduced=[[@{show_reduced}]]}}{{name=@{name}}} @{name_display} {{very_easy=[[ceil((@{total}*2)+@{penalty}))]]}} {{very_easy_crit=[[ceil(((@{total}*2)+@{penalty})*.1)]]}}  {{easy=[[ceil(((@{total}*1.5)+@{penalty}))]]}} {{easy_crit=[[ceil(((@{total}*1.5)+@{penalty})*.1)]]}} {{standard=[[(@{total}+@{penalty})]]}} {{standard_crit=[[ceil((@{total}+@{penalty})*.1)]]}} {{hard=[[(ceil(@{total}*.67)+@{penalty})]]}} {{hard_crit=[[ceil((ceil(@{total}*.67)+@{penalty})*.1)]]}}  {{formidable=[[(ceil(@{total}*.5)+@{penalty})]]}} {{formidable_crit=[[ceil((ceil(@{total}*.5)+@{penalty})*.1)]]}} {{herculean=[[(ceil(@{total}*.1)+@{penalty})]]}} {{herculean_crit=[[ceil((ceil(@{total}*.1)+@{penalty})*.1)]]}} {{rolled=[[1d100]]}} {{encumbered=[[0]]}} {{encumbrance_skills=[[0]]}} {{fatigue_skills=[[@{npc_fatigue_skills}]]}}"></div>
                             </div>
                         </fieldset>
                     </div>
@@ -4692,6 +4688,11 @@
                 setAttrs({version: "1.5.0"});
                 versioning();
             }
+            else if(v["version"] === "1.5.0") {
+                console.log("upgrading to v1.5.1");
+                setAttrs({version: "1.5.1"});
+                versioning();
+            }
             else {
                 console.log("Sheet fully updated");
             }