diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 05474f3939..5b0af46026 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -1,5 +1,5 @@
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab1" value="1" title="PC" checked="checked" />
-<!-- <input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" title="NPC" /> -->
+<input type="radio" name="attr_tab" class="sheet-tab sheet-tab2" value="2" title="NPC" />
 <input type="radio" name="attr_tab" class="sheet-tab sheet-tab3" value="3" title="Vehicle" />
 <div class="clear"></div>
 
@@ -7,7 +7,7 @@
 	<div class="3colrow">
 		<div class="col">
 			<label>&nbsp;Class:</label><input type="text" name="attr_rank" class="header" /><br />
-			<label>&nbsp;Level:</label><input type="number" name="attr_level" class="header" /> <input type="number" name="attr_level_max" value="floor(@{level}/2)"  disabled="true" class="header" /><br />
+			<label>&nbsp;Level:</label><input type="number" name="attr_level" class="header" /> <input type="number" name="attr_level_max" value="(floor(@{level}/2))"  disabled="true" class="header" /><br />
 			<label>Origin:</label><input type="text" name="attr_Origin" class="header"/>
 		</div>
 		<div class="col"> 
@@ -30,37 +30,37 @@
 				<tr>
 					<td class="col1">STR<br><div class="small">Strength</div></td>
 					<td><input type="number" name="attr_STR" value="8" title="Strength Score" /></td>
-					<td><input type="number" name="attr_Str_max" value="floor(@{STR}/2-5)" disabled="true" title="Strength Modifier" /></td>
+					<td><input type="number" name="attr_Str_max" value="(floor(@{STR}/2-5))" disabled="true" title="Strength Modifier" /></td>
 					<td><button type="roll" name="roll_STRCheck" value="Strength [[ 1d20 + @{Str|max}]]" title="Roll Strength"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">DEX<br><div class="small">Dexterity</div></td>
 					<td><input type="number" name="attr_DEX" value="8" title="Dexterity Score" /></td>
-					<td><input type="number" name="attr_DEX_max" value="floor(@{DEX}/2-5)" disabled="true" title="Dexterity Modifier" /></td>
+					<td><input type="number" name="attr_DEX_max" value="(floor(@{DEX}/2-5))" disabled="true" title="Dexterity Modifier" /></td>
 					<td><button type="roll" name="roll_DEXCheck" value="Dexterity [[ 1d20 + @{dex|max}]]" title="Roll Dexterity"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">CON<br><div class="small">Constitution</div></td>
 					<td><input type="number" name="attr_CON" value="8" title="Constitution Score" /></td>
-					<td><input type="number" name="attr_CON_max" value="floor(@{CON}/2-5)" disabled="true" title="Constitution Modifier" /></td>
+					<td><input type="number" name="attr_CON_max" value="(floor(@{CON}/2-5))" disabled="true" title="Constitution Modifier" /></td>
 					<td><button type="roll" name="roll_CONCheck" value="Constitution [[ 1d20 + @{con|max}]]" title="Roll Constitution"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">INT<br><div class="small">Intelligence</div></td>
 					<td><input type="number" name="attr_INT" value="8" title="Intelligence Score" /></td>
-					<td><input type="number" name="attr_INT_max" value="floor(@{INT}/2-5)" disabled="true" title="Intelligence Modifier" /></td>
+					<td><input type="number" name="attr_INT_max" value="(floor(@{INT}/2-5))" disabled="true" title="Intelligence Modifier" /></td>
 					<td><button type="roll" name="roll_INTCheck" value="Intelligence [[ 1d20 + @{int|max}]]" title="Roll Intelligence"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">WIS<br><div class="small">Wisdom</div></td>
 					<td><input type="number" name="attr_WIS" value="8" title="Wisdom Score" /></td>
-					<td><input type="number" name="attr_WIS_max" value="floor(@{WIS}/2-5)" disabled="true" title="Wisdom Modifier" /></td>
+					<td><input type="number" name="attr_WIS_max" value="(floor(@{WIS}/2-5))" disabled="true" title="Wisdom Modifier" /></td>
 					<td><button type="roll" name="roll_WISCheck" value="Wisdom [[ 1d20 + @{wis|max}]]" title="Roll Wisdom"></button></td>
 				</tr>
 				<tr>
 					<td class="col1">CHA<br><div class="small">Charisma</div></td>
 					<td><input type="number" name="attr_CHA" value="8" title="Charisma Score" /></td>
-					<td><input type="number" name="attr_CHA_max" value="floor(@{CHA}/2-5)" disabled="true" title="Charisma Modifier" /></td>
+					<td><input type="number" name="attr_CHA_max" value="(floor(@{CHA}/2-5))" disabled="true" title="Charisma Modifier" /></td>
 					<td><button type="roll" name="roll_CHACheck" value="Charisma [[ 1d20 + @{cha|max}]]" title="Roll Charisma"></button></td>
 				</tr>
 			  </tbody>
@@ -285,10 +285,9 @@
 							<td>&nbsp;+&nbsp;</td>
 							<td><input type="number" name="attr_attackModMisc" placeholder="Misc" value="0" style="width:40px"  title="Attack Miscellaneous Modifier" /></td>
 							
-							<td rowspan="2"> <button class='tokenaction' type="roll" name="roll_WeaponCheck" value="Attacking with: @{WeaponName} &#8226; @{WeaponName|max}
-							&#x00A;Attack Result: [[1d20 + @{BAB} + @{attackMod} + @{attackModMisc} + @{CT} + ?{Other Modifiers|0}]]
-							&#x00A;Damage Result:  [[@{damage} + @{damageMod} + @{damageMisc}]]
-							&#x00A;Attack Notes: @{WeaponNotes|max}" title="Attack Roll"> </button>
+							<td rowspan="2"> <button class='tokenaction' type="roll" name="roll_WeaponCheck" value="Attacking with @{WeaponName} &#8226; @{WeaponName|max} &#8226; Attack Notes: @{WeaponNotes|max}
+							&#x00A;Attack [[1d20 + @{BAB} + @{attackMod} + @{attackModMisc} + @{CT} + ?{Other Modifiers|0}]]
+							&#x00A;Damage  [[@{damage} + @{damageMod} + @{damageMisc}]]" title="Attack Roll"> </button>
 							</td>
 						</tr>
 						<tr>					
@@ -664,7 +663,290 @@
 	<div class="clear"></div>
 </div>
 
-<!-- Vehicle Stats -->
+<div class="sheet-tab-content sheet-tab2"> <!-- start NPC Sheet -->
+	<div class="2colrow">
+		<div class="col">
+			<label class="long">&nbsp;Class:</label><input type="text" name="attr_npc-rank" class="header" /><br />
+			<label class="long">&nbsp;Level:</label><input type="number" name="attr_npc-level" class="header" /> <input type="number" name="attr_npc-level_max" value="(floor(@{npc-level}/2))"  disabled="true" class="header" /><br />
+			<label class="long">Species:</label><input type="text" name="attr_npc-species" class="header" /><br />
+		</div>
+		<div class="col">   
+			<img height="101" width="300" src="http://galacticcampaigns.com/images/SWRPGlogo.png"/>
+		</div>
+	</div>
+
+	<hr/>
+
+	<div class="3colrow"">
+		<div class="col">
+			<table class="spacing">
+			  <tbody>
+				<tr><div class="textHead">Attributes</div>	</tr>
+				<tr>
+					<td class="col1">STR<br><div class="small">Strength</div></td>
+					<td><input type="number" name="attr_npc-STR" value="8" title="Strength Score" /></td>
+					<td><input type="number" name="attr_npc-Str_max" value="floor(@{npc-STR}/2-5)" disabled="true" title="Strength Modifier" /></td>
+					<td><button type="roll" name="roll_npc-STRCheck" value="Strength [[ 1d20 + @{npc-Str|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Strength"></button></td>
+				</tr>
+				<tr>
+					<td class="col1">DEX<br><div class="small">Dexterity</div></td>
+					<td><input type="number" name="attr_npc-DEX" value="8" title="Dexterity Score" /></td>
+					<td><input type="number" name="attr_npc-DEX_max" value="floor(@{npc-DEX}/2-5)" disabled="true" title="Dexterity Modifier" /></td>
+					<td><button type="roll" name="roll_npc-DEXCheck" value="Dexterity [[ 1d20 + @{npc-dex|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Dexterity"></button></td>
+				</tr>
+				<tr>
+					<td class="col1">CON<br><div class="small">Constitution</div></td>
+					<td><input type="number" name="attr_npc-CON" value="8" title="Constitution Score" /></td>
+					<td><input type="number" name="attr_npc-CON_max" value="floor(@{npc-CON}/2-5)" disabled="true" title="Constitution Modifier" /></td>
+					<td><button type="roll" name="roll_npc-CONCheck" value="Constitution [[ 1d20 + @{npc-con|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Constitution"></button></td>
+				</tr>
+				<tr>
+					<td class="col1">INT<br><div class="small">Intelligence</div></td>
+					<td><input type="number" name="attr_npc-INT" value="8" title="Intelligence Score" /></td>
+					<td><input type="number" name="attr_npc-INT_max" value="floor(@{npc-INT}/2-5)" disabled="true" title="Intelligence Modifier" /></td>
+					<td><button type="roll" name="roll_npc-INTCheck" value="Intelligence [[ 1d20 + @{npc-int|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Intelligence"></button></td>
+				</tr>
+				<tr>
+					<td class="col1">WIS<br><div class="small">Wisdom</div></td>
+					<td><input type="number" name="attr_npc-WIS" value="8" title="Wisdom Score" /></td>
+					<td><input type="number" name="attr_npc-WIS_max" value="floor(@{npc-WIS}/2-5)" disabled="true" title="Wisdom Modifier" /></td>
+					<td><button type="roll" name="roll_npc-WISCheck" value="Wisdom [[ 1d20 + @{npc-wis|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Wisdom"></button></td>
+				</tr>
+				<tr>
+					<td class="col1">CHA<br><div class="small">Charisma</div></td>
+					<td><input type="number" name="attr_npc-CHA" value="8" title="Charisma Score" /></td>
+					<td><input type="number" name="attr_npc-CHA_max" value="floor(@{npc-CHA}/2-5)" disabled="true" title="Charisma Modifier" /></td>
+					<td><button type="roll" name="roll_npc-CHACheck" value="Charisma [[ 1d20 + @{npc-cha|max} +{CT} + ?{Other Modifiers|0}]]" title="Roll Charisma"></button></td>
+				</tr>
+			  </tbody>
+			</table>
+		</div>
+		<div class="col">
+			<table>		
+				<tr>	<td colspan="3"><div class="textHead">Hit Points</div> </td>	<td colspan="3"></td>	<td><div class="textHead">Condition</div></td>	</tr>
+				<tr><th>Current</th>		<th></th>	<th>Total</th>	
+					<td colspan="3"></td>
+					<td rowspan="4" style="text-align:left">		
+						<input type="radio" value="0" name="attr_npc-CT" checked="true" /> Normal<br />
+						<input type="radio" value="-1" name="attr_npc-CT" /> -1<br />
+						<input type="radio" value="-2" name="attr_npc-CT" /> -2<br />
+						<input type="radio" value="-5" name="attr_npc-CT" /> -5<br />
+						<input type="radio" value="-10" name="attr_npc-CT" /> -10<br />
+						<input type="radio" value="-20" name="attr_npc-CT" /> Helpless</td>		
+				</tr>
+				<tr>	
+					<td> <input type="number" name="attr_npc-HP" value="0" title="Current HP" /></td>
+					<td>&nbsp;/&nbsp;</td>
+					<td><input type="number" name="attr_npc-HP_max" value="0" title="Max HP" /></td>
+				</tr>
+				<tr>	<td colspan="5"><div class="textHead">Threshold</div> </td>		<td width="15px"></td>	</tr>
+				<tr><th>Total</th>	<th></th>	<th>Fort</th> <th>Misc</th>		</tr>
+				<tr>	
+					<td><input type="number" name="attr_npc-DT" value="@{npc-Fortitude}+@{npc-DamageThresholdMisc}+@{npc-CTIgnoreDT}"  disabled="true" title="Damage Threshold" /></td>
+					<td>&nbsp;=&nbsp;</td>
+					<td><input type="number" name="attr_npc-DTFort" value="@{npc-Fortitude}+@{npc-CTIgnoreDT}"  disabled="true" title="Damage Threshold Fortitude Defence" /></td>
+					<td><input type="number" name="attr_npc-DamageThresholdMisc" value="0"  title="Damage Threshold Miscellaneous Modifier" /></td>
+				</tr>	
+			</table>
+			<p>Ignore CT? <input type="checkbox" value="-@{npc-CT}" name="attr_npc-CTIgnoreDT"  title="Does Damage Threshold ignore decrease from the Condition Track?" /></p>
+			
+			<table style="text-align:left">
+				<tr>	
+					<td><label>Damage Reduction</label><input type="number" name="attr_npc-DR" value="0" title="Damage Reduction" /></td>
+				</tr>
+				<tr>
+					<td><label>Shield Rating</label><input type="number" name="attr_npc-SR" value="0" title="Current Shield Rating" /> / <input type="number" name="attr_npc-SR_max" value="0" title="Max Shield Rating" /></td>
+				</tr>	
+			</table>
+			
+					
+		</div>
+		
+		<div class="col">				
+			<table>
+				<tr>		
+					<td><div class="textHead">Base Attack</div></td>
+					<td width="15px" rowspan="4"></td>				
+					<td><div class="textHead">Force Points</div></td>		
+				</tr>
+				<tr>		
+					<td><input type="number" name="attr_npc-BAB" value="0" title="Base Attack Bonus" /></td>				
+					<!-- rowspan placeholder> -->
+					<td><input type="number" name="attr_npc-FP" value="5" title="Current Force Points" /> / <input type="number" name="attr_npc-FP_max" value="5" title="Max Force Points" /></td>				
+				</tr>
+				<tr>	
+					<td><div class="textHead">Speed</div></td>
+					<!-- rowspan placeholder> -->
+					<td><div class="textHead">Destiny Points</div></td>	
+				</tr>
+				<tr>		
+					<td><input type="text" name="attr_npc-Speed" value="0" title="Speed in Squares" style="width:100px" /></td>				
+					<!-- rowspan placeholder> -->
+					<td><input type="number" name="attr_npc-DP" value="1" title="Current Destiny Points" /> / <input type="number" name="attr_npc-DP_max" value="1" title="Max Destiny Points" /></td>	
+				</tr>			
+			</table>
+			<table style="text-align:left">
+				<tr>	
+					<td><button type="roll" name="roll_npc-PerceptionShort" value="Perception [[ 1d20 + @{npc-Perception} +{CT} + ?{Other Modifiers|0}]]" title="Roll Perception"></button>
+					<input type="number" name="attr_npc-Perception" value="0" title="Perception" />
+					<label style="width:80px">Perception</label> <br />
+					<input style="margin-left:50px" type="text" name="attr_npc-Perception_max" placeholder="Senses Notes" title="Senses Notes" />					</td>
+				</tr>
+				<tr>
+					<td><button type="roll" name="roll_npc-Initiative" value="Initiative [[ 1d20 + @{npc-Initiative} +@{npc-CT} +?{Other Modifiers|0}  &{tracker}]]" title="Roll Initiative" class='tokenaction' ></button>
+					<input type="number" name="attr_npc-Initiative" value="0" title="Initiative" />	<label>Initiative</label>	</td>
+				</tr>
+				<tr>
+					<td><button type="roll" name="roll_npc-InitiativeTurn" value="Rolling for Turn Order [[ 1d20 + @{npc-Initiative} +@{npc-CT} +?{Other Modifiers|0}  &{tracker}]]" title="Roll Initiative to Turn Order window" class='tokenaction' ></button>		<label>Initiative (Turn Order)</label>	 </td>
+				</tr>
+				<tr>	
+					<td><button type="roll" name="roll_npc-GrappleCheck" value="Grapple [[1d20 + @{npc-Grapple} +{CT} + ?{Other Modifiers|0}]]" title="Roll Grapple"></button>	<input type="number" name="attr_npc-Grapple" value="0" title="Grapple = Dex or Str (whichever higher) + BAB + Size modifier" />	<label>Grapple</label>	</td>
+				</tr>	
+			</table>
+		</div>
+	</div>
+	 <br />
+	<div class="2colrow">
+		<div class="col">
+			<div class="textHead">Defenses</div>
+			<table class="spacing">
+				<tr>
+					<th></th>
+					<th></th>
+					<th>Total <br> after CT</th>
+					<th>Total</th>
+				</tr>
+				<tr>
+					<td class="col1" rowspan="2">Reflex</td>
+					<td></td>
+					<td><input type="number" name="attr_npc-Reflex" value="@{npc-RefTotal}+@{npc-CT}" disabled="true"  title="Reflex" /></td> 
+					<td><input type="number" name="attr_npc-RefTotal" value="10"  title="Reflex Total"/></td>
+				</tr>
+				<tr>
+					<!-- rowspan placeholder -->
+					<td class="col1"><div class="small">Flatfooted</div></td>
+					<td><input type="number" name="attr_npc-ReflexFlatFooted" value="@{npc-RefTotal|max}+@{npc-CT}" disabled="true"  title="Reflex Flat Footed" /></td>					 
+					<td><input type="number" name="attr_npc-RefTotal_max" value="10"  title="Reflex Total"/></td>
+				</tr>
+				<tr>
+					<td class="col1">Fortitude</td>
+					<td rowspan="2"></td>
+					<td><input type="number" name="attr_npc-Fortitude" value="@{npc-FortTotal}+@{npc-CT}" disabled="true" />					 
+					<td><input type="number" name="attr_npc-FortTotal" value="10"  title="Fortitude Total"/></td>
+				</tr>
+				<tr>
+					<td class="col1">Will</td>					
+					<!-- rowspan placeholder -->
+					<td><input type="number" name="attr_npc-Will" value="@{npc-WillTotal}+@{npc-CT}" disabled="true" /></td>					 
+					<td><input type="number" name="attr_npc-WillTotal" value="10"  title="Will Total"/></td>
+				</tr>
+			</table>
+			<div class="textHead">Attacks</div>
+				<fieldset class="repeating_npc-attack">	
+					<table class="spacing">
+						<tr>
+							<td colspan="3" width="75%">	<input type="text" name="attr_npc-WeaponName" placeholder="Weapon Name" style="width:100%"  title="Weapon Name" />		</td>
+							<td colspan="1">				<input type="text" name="attr_npc-WeaponName_max" placeholder="Type" style="width:100%" title="Weapon Type" />			</td>
+						</tr>
+						<tr>
+							<td rowspan="2" width="15px"></td>
+							<td class="col1">Attack</td>						
+							<td><input type="text" name="attr_npc-AttackTotal" value="@{npc-BAB}+@{npc-STR|max}"  title="Attack Total (You can use formulas, for example: @{npc-BAB}+@{npc-STR|max} or just enter the total attack modifier)" style="width:100%" /></td>
+							
+							<td rowspan="2"> <button class='tokenaction' type="roll" name="roll_npc-WeaponCheck" value="Attacking with @{npc-WeaponName} &#8226; @{npc-WeaponName|max} &#8226; Attack Notes @{npc-WeaponNotes|max}
+							&#x00A;Attack [[1d20 + @{npc-AttackTotal} + @{npc-CT} + ?{Attack - Other Modifiers|0}]]
+							&#x00A;Damage  [[@{npc-damage} + ?{Damage - Other Modifiers|0}]]" title="Attack Roll"> </button>
+							</td>
+						</tr>
+						<tr>				
+							<!-- rowspan placholder -->
+							<td class="col1">Damage</td>
+							<td><input type="text" name="attr_npc-damage" Value="2d8+(@{npc-STR|max}*2)+@{npc-level|max}"  style="width:100%" title="Weapon Damage (You can use formulas, for example: 2d8+(@{npc-STR|max}*2)+@{npc-level|max} or just enter the entire Damage modifier)"/>	</td>		
+							<!-- rowspan placholder -->
+						</tr>
+						<tr>					
+							<!-- rowspan placholder -->
+							<td colspan="5">
+								<textarea type="text" name="attr_npc-WeaponNotes_max" placeholder="Attack Notes" class="atkNotes" title="Attack Notes: ie Devesating Attack, Rapid Strike, Point Blank Shot" ></textarea>
+								<textarea type="text" name="attr_npc-WeaponNotes" placeholder="Weapon Notes" class="atkNotes" title="Weapon Notes"></textarea>
+							</td>
+						</tr>	
+					</table>
+				</fieldset>
+			<div class="textHead">Attack Options</div>
+				<textarea type="text" name="attr_npc-AttackOptions" rows="2" class="ActionNotes" title="Attack Options"></textarea>
+			<div class="textHead">Special Actions</div>
+				<textarea type="text" name="attr_npc-SpecialActions" rows="2" class="ActionNotes" title="Special Actions"></textarea>	
+		</div>	
+		<div class="col">
+			<div class="textHead">Skills</div>
+			<fieldset class="repeating_attack">	
+				<table class="spacing">
+					<tr>
+						<td class="skillsCol1"><input type="text" name="attr_npc-Skill" placeholder="Skill Name" title="Skill Name" /></td>
+						<td><button type="roll" name="roll_npc-SkillCheck" value="@{npc-SkillName} [[ 1d20 + @{npc-skill|max} + @{npc-CT} + ?{Other Modifiers|0}]]" title="Roll Skill"></button></td>
+						<td><input type="number" name="attr_npc-Skill_max" value="0" title="Skill Total" /></td>
+					</tr>
+					<tr>		
+						<td colspan="3"><input type="text" name="attr_npc-SkillNotes" placeholder="Skill Notes" title="Skill Notes" style="width:100%" /></td>
+					</tr>
+				</table>
+			</fieldset>	
+			
+			<div class="textHead">Special Qualities</div>
+			<textarea type="text" name="attr_npc-SpecialQualities" title="Special Qualities" ></textarea>
+		</div>		
+	</div>	
+
+	<div class="clear"></div>
+	<hr>
+
+	<div class="2colrow">
+		<div class="col">
+			<div class="textHead">Equipment</div>
+			<textarea type="text" name="attr_npc-Equipment" style="height:80px" title="Equipment List"></textarea>			
+		</div>
+		<div class="col">
+			<table>
+				<tr>	
+					<td><div class="textHead">Credits</div></td>
+					<td rowspan="2" width="15"> </td>	
+					<td width="225px"><div class="textHead">Languages</div></td>		
+				</tr>
+				<tr>
+					<td valign="top"><input type="text" name="attr_npc-credits" value="0" style="width:100%" title="Credits" /></td>
+					<!-- rowspan placeholder -->
+					<td><textarea type="text" name="attr_npc-Language" style="height:80px" title="Language List"></textarea></tr>				
+				</tr>			
+			</table>
+		</div>
+	</div>
+	<div class="clear"></div>
+	<hr>
+	<div class="3colrow">
+		<div class="col">
+			<div class="textHead">Feats</div>
+			<textarea type="text" name="attr_npc-Feats" title="Feats List" ></textarea>
+		</div>
+		<div class="col">
+			<div class="textHead">Talents</div>
+			<textarea type="text" name="attr_npc-Talents" title="Talents List"></textarea>
+		</div>
+		<div class="col">
+			<div class="textHead">Force Powers</div>
+			<textarea type="text" name="attr_npc-ForcePowers" title="Force Power Suite"></textarea>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col">
+			<div class="textHead">Notes</div>
+			<textarea type="text" name="attr_npc-Notes" title="Notes"></textarea>
+		</div>
+	</div>
+	<div class="clear"></div>
+</div>
+
+<!-- start Vehicle Stats -->
 <div class="sheet-tab-content sheet-tab3">
 <div class="3colrow">
     <div class="col"> 
@@ -741,7 +1023,7 @@
 			<tr>		
 				<td><div class="small">Character<br/>Scale</div><input type="number" name="attr_vehicle-Speed" value="0" title="Speed in Squares (Character Scale)" /></td>
 				<td><div class="small">Starship<br/>Scale</div><input type="number" name="attr_vehicle-Speed_max" value="0" title="Speed in Squares (Starship Scale)" /></td>
-				<td><div class="small"><br />Velocity</div><input type="text" style="width:50px" name="attr_vehicle-Velocity" value="0" title="Velocity (km/h)" /></td>
+				<td><div class="small"><br />Velocity</div><input type="text" style="width:60px" name="attr_vehicle-Velocity" value="0" title="Velocity (km/h)" /></td>
 			</tr>	
 		</table>
 		<br />		
@@ -885,10 +1167,9 @@
 						<td>	&nbsp;+&nbsp;</td>
 						<td><input type="number" name="attr_vehicle-attackModMisc" placeholder="Misc" value="0" title="Attack Miscellaneous Modifier" /></td>
 						
-						<td rowspan="2"> <button class='tokenaction' type="roll" name="roll_vehicle-WeaponCheck" value="Attacking with: @{vehicle-WeaponName} &#8226; @{vehicle-WeaponName|max}
-						&#x00A;Attack Result: [[1d20 + @{vehicle-AttackBAB} + @{vehicle-AttackBAB|max} + @{vehicle-int|max} + @{vehicle-attackModMisc} + @{vehicle-CT} + ?{Other Modifiers|0}]]
-						&#x00A;Damage Result:  [[(@{vehicle-damage} + @{vehicle-damageMisc})*@{vehicle-damage|max}]]
-						&#x00A;Attack Notes: @{vehicle-WeaponNotes|max}" title="Attack Roll"> </button>
+						<td rowspan="2"> <button class='tokenaction' type="roll" name="roll_vehicle-WeaponCheck" value="Attacking with @{vehicle-WeaponName} &#8226; @{vehicle-WeaponName|max}  &#8226; Attack Notes: @{vehicle-WeaponNotes|max}
+						&#x00A;Attack Result [[1d20 + @{vehicle-AttackBAB} + @{vehicle-AttackBAB|max} + @{vehicle-int|max} + @{vehicle-attackModMisc} + @{vehicle-CT} + ?{Other Modifiers|0}]]
+						&#x00A;Damage Result  [[(@{vehicle-damage} + @{vehicle-damageMisc})*@{vehicle-damage|max}]]" title="Attack Roll"> </button>
 						</td>
 					</tr>
 					<tr>