diff --git a/Black_Crusade/BlackCrusade.html b/Black_Crusade/BlackCrusade.html
index f3df84bb5e..9ae4bb1990 100644
--- a/Black_Crusade/BlackCrusade.html
+++ b/Black_Crusade/BlackCrusade.html
@@ -58,10 +58,8 @@ on("change:repeating_rangedweapons", function() {
 				    <div class="sheet-item" style="width:80%"><input name="attr_Race" type="text"></div>
 				</div>
 				<div class="sheet-row">
-					<div class="sheet-item sheet-span2" style="width:15%"><span data-i18n="rank-u">Rank:</span></div>
-                        <div class="sheet-item" style="width:8%"><input name="attr_Rank" type="number" step="0.01" style="text-align:center"></div>
 					<div class="sheet-item sheet-span2" style="width:35%"><span data-i18n="warband-name-u">Warband Name:</span></div>
-					    <div class="sheet-item" style="width:37%"><input name="attr_Warband" type="text"></div>
+					    <div class="sheet-item" style="width:60%"><input name="attr_Warband" type="text"></div>
 				</div>
 				<div class="sheet-row">
 					<div class="sheet-item sheet-span2" style="width:15%"><span data-i18n="pride-u">Pride:</span></div>
@@ -2003,31 +2001,31 @@ Black Carapace: While wearing Power Armour, enemies do not gain a bonus to hit y
 			<div class="sheet-col">
 			    <div class="sheet-row">
 					<div class="sheet-item" style="width:50%"><h3 data-i18n="khorne-u" style="text-align:right">Khorne: </h3></div>
-					<div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Khorne_ali" type="number" step="0.01" style="font-size: 14pt; height: 35px;text-align:center"></div>
+					<div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Khorne_ali" type="text" style="font-size: 14pt; height: 35px;text-align:center"></div>
 				</div>
 			</div>
 			<div class="sheet-col">
 			<div class="sheet-row">
 				<div class="sheet-item" style="width:50%"><h3 data-i18n="slaanesh-u" style="text-align:right">Slaanesh: </h3></div>
-                <div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Slaanesh_ali" type="number" step="0.01" style="font-size: 14pt; height: 35px;text-align:center"></div>
+                <div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Slaanesh_ali" type="text" style="font-size: 14pt; height: 35px;text-align:center"></div>
 			</div>
 			</div>
 			</div>
 			    <div class="sheet-row">
 					<div class="sheet-item" style="width:50%"><h3 data-i18n="unaligned-u" style="text-align:right">Unaligned: </h3></div>
-        			<div class="sheet-item sheet-brackets" style="width:10%"><input name="attr_Unaligned_ali" type="number" step="0.01" style="font-size: 14pt; height: 35px;text-align:center"></div>
+        			<div class="sheet-item sheet-brackets" style="width:10%"><input name="attr_Unaligned_ali" type="text" style="font-size: 14pt; height: 35px;text-align:center"></div>
 	    		</div>
 			<div class="sheet-2colrow">
 			<div class="sheet-col">
 				<div class="sheet-row">
 					<div class="sheet-item" style="width:50%"><h3 data-i18n="nurgle-u" style="text-align:right">Nurgle: </h3></div>
-                    <div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Nurgle_ali" type="number" step="0.01" style="font-size: 14pt; height: 35px;text-align:center"></div>
+                    <div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Nurgle_ali" type="text" style="font-size: 14pt; height: 35px;text-align:center"></div>
 				</div>
 			</div>
 			<div class="sheet-col">
 				<div class="sheet-row">
 					<div class="sheet-item" style="width:50%"><h3 data-i18n="tzeentch-u" style="text-align:right">Tzeentch: </h3></div>
-					<div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Tzeentch_ali" type="number" step="0.01" style="font-size: 14pt; height: 35px;text-align:center"></div>
+					<div class="sheet-item sheet-brackets" style="width:20%"><input name="attr_Tzeentch_ali" type="text" style="font-size: 14pt; height: 35px;text-align:center"></div>
 	            </div>
 			</div>
 			</div>
@@ -2051,10 +2049,10 @@ Black Carapace: While wearing Power Armour, enemies do not gain a bonus to hit y
 						<input disabled="true" name="attr_XPtoSpend" type="number" step="0.01" value="@{XPTotal} - @{XPSpent}">
 					</div>
 					<div class="sheet-item" style="width:1%"></div>
-					<div class="sheet-item" style="width:12%">
+					<div class="sheet-item" style="width:15%">
 						<span data-i18n="total-spent-u">Total XP Spent:</span>
 					</div>
-					<div class="sheet-item" style="width:22%">
+					<div class="sheet-item" style="width:19%">
 						<input name="attr_XPSpent" type="number" step="0.01" value="0">
 					</div>
 					<div class="sheet-item" style="width:1%"></div>
@@ -3080,11 +3078,11 @@ Black Carapace: While wearing Power Armour, enemies do not gain a bonus to hit y
 							<div class="sheet-item" style="width: 15%;"><span data-i18n="name-u">Name:</span></div><input type="hidden" name="attr_my_hidden_row_id" />
 							<div class="sheet-item" style="width: 38%;"><input name="attr_Rangedweaponname" type="text" /></div>
 								<div class="sheet-item" style="width: 7%;"><span data-i18n="weight-u">Wt.:</span></div>
-							<div class="sheet-item" style="width: 11%;"><input name="attr_rangedwwt" type="number" step="0.01" value="0" data-i18n-placeholder="kilograms-u" placeholder="kg" style="text-align:center;"/></div>
-							<div class="sheet-item" style="width: 12%;"><span data-i18n="class-u">Class:</span></div>
-							<div class="sheet-item" style="width: 18%;">
-							    <select class="attr_Rangedweaponclass">
-						        	<option selected data-i18n="pistol-u">Pistol</option>
+							<div class="sheet-item" style="width: 8%;"><input name="attr_rangedwwt" type="number" step="0.01" value="0" data-i18n-placeholder="kilograms-u" placeholder="kg" style="text-align:center;"/></div>
+							<div class="sheet-item" style="width: 11%;"><span data-i18n="class-u">Class:</span></div>
+							<div class="sheet-item" style="width: 21%;">
+							    <select class="attr_Rangedweaponclass" name="attr_Rangedweaponclass">
+						        	<option data-i18n="pistol-u">Pistol</option>
 						        	<option data-i18n="basic-u">Basic</option>
 						        	<option data-i18n="heavy-u">Heavy</option>
 						        	<option data-i18n="thrown-u">Thrown</option>
@@ -3164,8 +3162,8 @@ Black Carapace: While wearing Power Armour, enemies do not gain a bonus to hit y
 							<div class="sheet-item" style="width: 55%;"><input name="attr_Daemonweaponname" type="text" /></div>
 							<div class="sheet-item" style="width: 12%;"><span data-i18n="class-u">Class:</span></div>
 							<div class="sheet-item" style="width: 18%;">
-							    <select class="attr_Daemonweaponclass">
-						        	<option selected data-i18n="melee-u">Melee</option>
+							    <select class="attr_Daemonweaponclass" name="attr_Rangedweaponclass">
+						        	<option data-i18n="melee-u">Melee</option>
 						        	<option data-i18n="pistol-u">Pistol</option>
 						        	<option data-i18n="basic-u">Basic</option>
 						        	<option data-i18n="heavy-u">Heavy</option>