diff --git a/Star Wars Saga Edition/SWRPGlogo.png b/Star Wars Saga Edition/SWRPGlogo.png
new file mode 100644
index 0000000000..d357c087d3
Binary files /dev/null and b/Star Wars Saga Edition/SWRPGlogo.png differ
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.css b/Star Wars Saga Edition/StarWarsSagaEdition.css
index 8cf801d223..0754a10f8d 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.css	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.css	
@@ -213,28 +213,33 @@ div.sheet-tab-content
 
 /* Sheet roll template for Attacks */
 .sheet-rolltemplate-attack table {
-    width: 100%;
-	border: 1px solid;
-	color: black;
+	width:100%;
 	font-size: 1em;
 	font-family: "Helvetica Neue", Helvetica, sans-serif;
+	border-collapse:separate;
+    border:solid black 1px;
+    border-top-right-radius:5px;
+    border-top-left-radius:5px;
+	-moz-border-radius-topleft: 5px;
+	-moz-border-radius-topright: 5px;
+    -webkit-border-top-left-radius: 5px;
+	-webkit-border-top-right-radius: 5px;
 }
 
 .sheet-rolltemplate-attack th {
-	background-color: rgba(112, 32, 130,1);
+	background-color: #000000;
 	color: #ffffff;
 	padding: 2px;
-	border-bottom: 1px solid black;
 	line-height: 1.6em;
-	font-size: 1.2em;
-	text-align: center;
+	font-size: 1.2em;	
+    border-top: none;
 }
-
 .sheet-rolltemplate-attack .sheet-subheader {
-	background-color: rgba(176, 51, 204,1);
+	background-color: #333333;
     color: #ffffff;
     font-size: 1em;
     font-style: italic;
+	text-align: center;
 }
 .sheet-rolltemplate-attack .sheet-tcat {
 	font-weight: bold;
@@ -242,16 +247,16 @@ div.sheet-tab-content
 
 .sheet-rolltemplate-attack td {
 	padding: 5px;
-	border-bottom: 1px solid black;
+	border: 1px solid black;
 	text-align: left;
 }
 
 .sheet-rolltemplate-attack tr:nth-child(odd) {
-	background-color: rgba(217, 217, 214,1);
+	background-color: #ffffff;
 }
 
 .sheet-rolltemplate-attack tr:nth-child(even) {
-	background-color: rgba(233, 233, 233,1);
+	background-color: #C4C4C4;
 }
 
 .sheet-rolltemplate-attack .inlinerollresult  {
@@ -275,34 +280,46 @@ div.sheet-tab-content
 
 /* sheet roll template for skills */
 .sheet-rolltemplate-skill table {
-    width: 100%;
-	border: 1px solid;
-	color: black;
+    width:100%;
 	font-size: 1em;
 	font-family: "Helvetica Neue", Helvetica, sans-serif;
+	border-collapse:separate;
+    border:solid black 1px;
+    border-radius:5px;
+	-moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+.sheet-rolltemplate-skill .sheet-tcat {
+	font-weight: bold;
 }
-
 .sheet-rolltemplate-skill th {
-	background-color: rgba(112, 32, 130,1);
+	background-color: #000000;
 	color: #ffffff;
-	padding: 2px;
-	border-bottom: 1px solid black;
+	padding: 2px;		
+    border-top: none;
 	line-height: 1.6em;
 	font-size: 1.2em;
 	text-align: center;
 }
 
 .sheet-rolltemplate-skill td {
-	padding: 5px;
-	border-bottom: 1px solid black;
-	text-align: left;
+	padding: 5px;		    
+    border:solid black 1px;
+	text-align:left;
 }
+
 .sheet-rolltemplate-skill tr:nth-child(odd) {
-	background-color: rgba(217, 217, 214,1);
+	background-color: #ffffff;
 }
 
 .sheet-rolltemplate-skill tr:nth-child(even) {
-	background-color: rgba(233, 233, 233,1);
+	background-color: #C4C4C4;
+}
+
+.sheet-rolltemplate-skill tr:first-child td{
+	text-align: center;
+	border-left: none;
+	width: 75px;
 }
 .sheet-rolltemplate-skill .inlinerollresult  {
 	display: inline-block;
diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 45e5b1348b..ecd4b828c8 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -16,7 +16,7 @@
 			<label class="long">Destiny:</label><input type="text" name="attr_destiny" class="header" /><br />
 		</div>
 		<div class="col">   
-			<div class="record"><img height="101" width="300" src="http://galacticcampaigns.com/images/SWRPGlogo.png"/> <br />
+			<div class="record"><img height="101" width="300" src="http://i.imgur.com/DzKBH23.png"/> <br />
             Character Record Sheet</div>
 		</div>
 	</div>
@@ -32,37 +32,37 @@
 					<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><button type="roll" name="roll_STRCheck" value="&{template:skill} {{name=Strength}} {{skill=[[ 1d20+@{Str|max}+@{CT}]]}}" title="Roll Strength"></button></td>
+					<td><button type="roll" name="roll_STRCheck" value="&{template:skill} {{name=Strength}} {{skill=[[1d20+@{Str|max}+@{CT}]]}}" 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><button type="roll" name="roll_DEXCheck" value="&{template:skill} {{name=Dexterity}} {{skill=[[ 1d20+@{Dex|max}+@{CT}]]" title="Roll Dexterity"></button></td>
+					<td><button type="roll" name="roll_DEXCheck" value="&{template:skill} {{name=Dexterity}} {{skill=[[1d20+@{Dex|max}+@{CT}]]}}" 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><button type="roll" name="roll_CONCheck" value="&{template:skill} {{name=Constitution}} {{skill=[[ 1d20+@{Con|max}+@{CT}]]" title="Roll Constitution"></button></td>
+					<td><button type="roll" name="roll_CONCheck" value="&{template:skill} {{name=Constitution}} {{skill=[[ 1d20+@{Con|max}+@{CT}]]}}" 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><button type="roll" name="roll_INTCheck" value="&{template:skill} {{name=Intelligence}} {{skill=[[ 1d20+@{Int|max}+@{CT}]]" title="Roll Intelligence"></button></td>
+					<td><button type="roll" name="roll_INTCheck" value="&{template:skill} {{name=Intelligence}} {{skill=[[ 1d20+@{Int|max}+@{CT}]]}}" 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><button type="roll" name="roll_WISCheck" value="&{template:skill} {{name=Wisdom}} {{skill=[[ 1d20+@{Wis|max}+@{CT}]]" title="Roll Wisdom"></button></td>
+					<td><button type="roll" name="roll_WISCheck" value="&{template:skill} {{name=Wisdom}} {{skill=[[ 1d20+@{Wis|max}+@{CT}]]}}" 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><button type="roll" name="roll_CHACheck" value="&{template:skill} {{name=Charisma}} {{skill=[[ 1d20+@{Cha|max}+@{CT}]]" title="Roll Charisma"></button></td>
+					<td><button type="roll" name="roll_CHACheck" value="&{template:skill} {{name=Charisma}} {{skill=[[ 1d20+@{Cha|max}+@{CT}]]}}" title="Roll Charisma"></button></td>
 				</tr>
 			  </tbody>
 			</table>
@@ -78,7 +78,7 @@
 						<input type="radio" value="-2" name="attr_CT" /> -2<br />
 						<input type="radio" value="-5" name="attr_CT" /> -5<br />
 						<input type="radio" value="-10" name="attr_CT" /> -10<br />
-						<input type="radio" value="-20" name="attr_CT" /> Helpless</td>		
+						<input type="radio" value="-10" name="attr_CT" /> Helpless</td>		
 				</tr>
 				<tr>	
 					<td> <input type="number" name="attr_HP" value="0" title="Current HP" /></td>
@@ -265,7 +265,7 @@
 					<td><input type="number" name="attr_Speed_max" value="0" title="Armor Max Speed"  /></td>
 				</tr>
 				<tr>		
-					<td colspan="5"><label>Notes</label><textarea type="text" name="attr_ArmorNotes" class="atkNotes" style="width:82%" title="Armor Notes" ></textarea></td>
+					<td colspan="5"><label>Notes</label><textarea type="text" name="attr_ArmorNotes" class="atknotes" style="width:82%" title="Armor Notes" ></textarea></td>
 				</tr>
 			</table>
 			<div class="textHead">Attacks</div>
@@ -298,7 +298,7 @@
 							<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  type="roll" name="roll_WeaponCheck" value="&{template:attack} {{name=@{WeaponName}}} {{type=@{WeaponName|max}}} {{attack=[[1d20cs>@{WeaponCrit} + @{BAB} + @{attackMod} + @{attackModMisc} +@{CT} + ?{Other Modifiers (Attack)|0}]]}} {{atknotes= @{WeaponNotes|max}}} {{damage=[[@{damage} + @{damageMod} + @{damageMisc}]]}} {{dmgcrit=[[(@{damage} + @{damageMod} + @{damageMisc})*@{WeaponCrit|max}+?{Other Modifiers (Damage)|0}]]}}" title="Attack Roll"> </button>
+							<td rowspan="2"> <button  type="roll" name="roll_WeaponCheck" value="&{template:attack} {{name=@{WeaponName}}} {{type=@{WeaponName|max}}} {{attack=[[1d20cs>@{WeaponCrit} + @{BAB} + @{attackMod} + @{attackModMisc} +@{CT} + ?{Other Modifiers (Attack)|0}]]}} {{atkeffect= @{WeaponNotes|max}}} {{damage=[[@{damage} + @{damageMod} + @{damageMisc}]]}} {{dmgcrit=[[(@{damage} + @{damageMod} + @{damageMisc})*@{WeaponCrit|max}+?{Other Modifiers (Damage)|0}]]}}" title="Attack Roll"> </button>
 							</td>
 						</tr>
 						<tr>					
@@ -511,7 +511,7 @@
 					</tr>
 					<tr>
 						<td class="skillsCol1">Physical Science<br /><div class="small">Knowledge</div></td>
-						<td><button type="roll" name="roll_Knowledge-PhysicalScienceCheck" value="&{template:skill} {{name=Knowledge (Physical Science)}} {{skill=[[1d20+@{Knowledge-Physical Science}+?{Other Modifiers|0}]]}}" title="Roll Knowledge (Physical Science)"></button></td>
+						<td><button type="roll" name="roll_Knowledge-PhysicalScienceCheck" value="&{template:skill} {{name=Knowledge (Physical Science)}} {{skill=[[1d20+@{Knowledge-PhysicalScience}+?{Other Modifiers|0}]]}}" title="Roll Knowledge (Physical Science)"></button></td>
 						<td><input type="number" class="skills" name="attr_Knowledge-PhysicalScience" value="@{level|max}+@{Knowledge-PhysicalScienceMod}+@{Knowledge-PhysicalScienceFeat}+@{Knowledge-PhysicalScienceFeat|max}+@{Knowledge-PhysicalScienceMisc}+@{CT}" disabled="true" title="Knowledge (Physical Science) Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_Knowledge-PhysicalScienceMod" class="modtype" title="Knowledge (Physical Science) Mod (default INT)">
 							  <option value="@{str|max}">STR</option>
@@ -703,7 +703,7 @@
 					</tr>
 					<tr>
 						<td class="skillsCol1">Treat Injury</td>
-						<td><button type="roll" name="roll_TreatInjuryCheck" value="&{template:skill} {{name=Treat Injury}} {{skill=[[1d20+@{TreatInjuryFeat}+?{Other Modifiers|0}]]}}" title="Roll Treat Injury"></button></td>
+						<td><button type="roll" name="roll_TreatInjuryCheck" value="&{template:skill} {{name=Treat Injury}} {{skill=[[1d20+@{TreatInjury}+?{Other Modifiers|0}]]}}" title="Roll Treat Injury"></button></td>
 						<td><input type="number" class="skills" name="attr_TreatInjury" value="@{level|max}+@{TreatInjuryMod}+@{TreatInjuryFeat}+@{TreatInjuryFeat|max}+@{TreatInjuryMisc}+@{CT}" disabled="true" title="Treat Injury Total" /></td> <td>&nbsp;=&nbsp;</td>	
 						<td><select name="attr_TreatInjuryMod" class="modtype" title="Treat Injury Mod (default WIS)">
 							  <option value="@{str|max}">STR</option>
@@ -857,7 +857,7 @@
 			<label class="long">Species:</label><input type="text" name="attr_species" class="header" /><br />
 		</div>
 		<div class="col">   
-			<div class="record"><img height="101" width="300" src="http://galacticcampaigns.com/images/SWRPGlogo.png"/> <br />
+			<div class="record"><img height="101" width="300" src="http://i.imgur.com/DzKBH23.png"/> <br />
             NPC Record Sheet</div>
 		</div>
 	</div>
@@ -873,37 +873,37 @@
 					<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><button type="roll" name="roll_NPC-STRCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{Str|max}+@{npc-CT}]]" title="Roll Strength"></button></td>
+					<td><button type="roll" name="roll_NPC-STRCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{Str|max}+@{npc-CT}]]}}" 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><button type="roll" name="roll_NPC-DEXCheck" value="&{template:skill} {{name=Dexterity}}} {{skill=[[ 1d20+@{dex|max}+@{npc-CT}]]" title="Roll Dexterity"></button></td>
+					<td><button type="roll" name="roll_NPC-DEXCheck" value="&{template:skill} {{name=Dexterity}}} {{skill=[[ 1d20+@{dex|max}+@{npc-CT}]]}}" 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><button type="roll" name="roll_NPC-CONCheck" value="&{template:skill} {{name=Constitution}}} {{skill=[[ 1d20+@{Con|max}+@{npc-CT}]]" title="Roll Constitution"></button></td>
+					<td><button type="roll" name="roll_NPC-CONCheck" value="&{template:skill} {{name=Constitution}}} {{skill=[[ 1d20+@{Con|max}+@{npc-CT}]]}}" 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><button type="roll" name="roll_NPC-INTCheck" value="&{template:skill} {{name=Intelligence}}} {{skill=[[ 1d20+@{int|max}+@{npc-CT}]]"></button></td>
+					<td><button type="roll" name="roll_NPC-INTCheck" value="&{template:skill} {{name=Intelligence}}} {{skill=[[ 1d20+@{int|max}+@{npc-CT}]]}}"></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><button type="roll" name="roll_NPC-WISCheck" value="&{template:skill} {{name=Wisdom}}} {{skill=[[ 1d20+@{Wis|max}+@{npc-CT}]]" title="Roll Wisdom"></button></td>
+					<td><button type="roll" name="roll_NPC-WISCheck" value="&{template:skill} {{name=Wisdom}}} {{skill=[[ 1d20+@{Wis|max}+@{npc-CT}]]}}" 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><button type="roll" name="roll_NPC-CHACheck" value="&{template:skill} {{name=Charisma}}} {{skill=[[ 1d20+@{Cha|max}+@{npc-CT}]]" title="Roll Charisma"></button></td>
+					<td><button type="roll" name="roll_NPC-CHACheck" value="&{template:skill} {{name=Charisma}}} {{skill=[[ 1d20+@{Cha|max}+@{npc-CT}]]}}" title="Roll Charisma"></button></td>
 				</tr>
 			  </tbody>
 			</table>
@@ -919,7 +919,7 @@
 						<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>		
+						<input type="radio" value="-10" name="attr_NPC-CT" /> Helpless</td>		
 				</tr>
 				<tr>	
 					<td> <input type="number" name="attr_HP" value="0" title="Current HP"/></td>
@@ -996,7 +996,7 @@
 					<th>Misc</th>	
 				</tr>
 				<tr>
-					<td><button type="roll" name="roll_NPC-GrappleCheck" value="Grapple [[1d20 + @{NPC-Grapple} + ?{Other Modifiers|0}]]" title="Roll Grapple"></button></td>
+					<td><button type="roll" name="roll_NPC-GrappleCheck" value="Grapple [[1d20 + @{NPC-Grapple} + ?{Other Modifiers|0}]]}}" title="Roll Grapple"></button></td>
 					<td><input type="number" name="attr_NPC-Grapple" value="@{BAB} + @{GrpMod} + @{GrpMod|max} +@{npc-ct}" disabled="true" title="Grapple" /></td>
 					<td>&nbsp;=&nbsp;</td>
 					<td> <select name="attr_GrpMod" class="modtype" title="Choose the highest modifier">
@@ -1066,7 +1066,7 @@
 							<td><input type="text" name="attr_Attack" value="@{BAB}+@{STR|max}"  title="Attack Total (You can use formulas, for example: @{BAB}+@{STR|max} or enter the total attack modifier)" style="width:100%" /></td>
 							<td><input type="number" name="attr_AttackTotal" value="@{Attack}+@{npc-ct}"  disabled="true" title="Attack Total Preview" /></td>	
 							
-							<td rowspan="2"> <button type="roll" name="roll_WeaponCheck" value="&{template:attack} {{name=@{WeaponName}}} {{type=@{WeaponName|max}}} {{attack=[[1d20cs>@{WeaponCrit} + @{Attack} +@{npc-CT} + ?{Other Modifiers (Attack)|0}]]}} {{atknotes= @{WeaponNotes|max}}} {{damage=[[@{damage}+?{Other Modifiers (Damage)|0}]]}} {{dmgcrit=[[(@{damage})*@{WeaponCrit|max} +?{Other Modifiers (Damage)|0}]]}}" title="Attack and Damage Roll (will include CT where applicable)"> </button>
+							<td rowspan="2"> <button type="roll" name="roll_WeaponCheck" value="&{template:attack} {{name=@{WeaponName}}} {{type=@{WeaponName|max}}} {{attack=[[1d20cs>@{WeaponCrit} + @{Attack} +@{npc-CT} + ?{Other Modifiers (Attack)|0}]]}} {{atkeffect= @{WeaponNotes|max}}} {{damage=[[@{damage}+?{Other Modifiers (Damage)|0}]]}} {{dmgcrit=[[(@{damage})*@{WeaponCrit|max} +?{Other Modifiers (Damage)|0}]]}}" title="Attack and Damage Roll (will include CT where applicable)"> </button>
 							</td>
 						</tr>
 						<tr>				
@@ -1221,7 +1221,7 @@
 		<label class="long">Passengers:</label><input type="number" name="attr_vehicle-passengers" class="header" /><br />
     </div>
 	<div class="col">   
-        <div class="record"><img height="101" width="300" src="http://galacticcampaigns.com/images/SWRPGlogo.png"/> <br />
+        <div class="record"><img height="101" width="300" src="http://i.imgur.com/DzKBH23.png"/> <br />
             Vehicle Record Sheet</div>
     </div>
 </div>
@@ -1236,19 +1236,19 @@
 				<td class="col1">STR<br><div class="small">Strength</div></td>
 				<td><input type="number" name="attr_vehicle-STR" value="8" title="Strength Score" /></td>
 				<td><input type="number" name="attr_vehicle-Str_max" value="floor(@{vehicle-STR}/2-5)" disabled="true" title="Strength Modifier" /></td>
-				<td><button type="roll" name="roll_vehicle-STRCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{vehicle-Str|max}+@{vehicle-CT}]]" title="Roll Strength"></button></td>
+				<td><button type="roll" name="roll_vehicle-STRCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{vehicle-Str|max}+@{vehicle-CT}]]}}" title="Roll Strength"></button></td>
 			</tr>
 			<tr>
 				<td class="col1">DEX<br><div class="small">Dexterity</div></td>
 				<td><input type="number" name="attr_vehicle-DEX" value="8" title="Dexterity Score" /></td>
 				<td><input type="number" name="attr_vehicle-DEX_max" value="floor(@{vehicle-DEX}/2-5)" disabled="true" title="Dexterity Modifier" /></td>
-				<td><button type="roll" name="roll_vehicle-DEXCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{vehicle-dex|max}+@{vehicle-CT}]]" title="Roll Dexterity"></button></td>
+				<td><button type="roll" name="roll_vehicle-DEXCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{vehicle-dex|max}+@{vehicle-CT}]]}}" title="Roll Dexterity"></button></td>
 			</tr>
 			<tr>
 				<td class="col1">INT<br><div class="small">Intelligence</div></td>
 				<td><input type="number" name="attr_vehicle-INT" value="8" title="Intelligence Score" /></td>
 				<td><input type="number" name="attr_vehicle-INT_max" value="floor(@{vehicle-INT}/2-5)" disabled="true" title="Intelligence Modifier" /></td>
-				<td><button type="roll" name="roll_vehicle-INTCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{vehicle-int|max}+@{vehicle-CT}]]" title="Roll Intelligence"></button></td>
+				<td><button type="roll" name="roll_vehicle-INTCheck" value="&{template:skill} {{name=Strength}}} {{skill=[[ 1d20+@{vehicle-int|max}+@{vehicle-CT}]]}}" title="Roll Intelligence"></button></td>
 			</tr>
 		  </tbody>
 		</table>
@@ -1264,7 +1264,7 @@
 					<input type="radio" value="-2" name="attr_vehicle-CT" /> -2<br />
 					<input type="radio" value="-5" name="attr_vehicle-CT" /> -5<br />
 					<input type="radio" value="-10" name="attr_vehicle-CT" /> -10<br />
-					<input type="radio" value="-20" name="attr_vehicle-CT" /> Helpless</td>		
+					<input type="radio" value="-10" name="attr_vehicle-CT" /> Helpless</td>		
 			</tr>
 			<tr>	
 				<td> <input type="number" name="attr_vehicle-HP" value="0" title="Current HP" /></td>
@@ -1421,7 +1421,7 @@
 						<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 type="roll" name="roll_vehicle-WeaponCheck" value="&{template:attack} {{name=@{vehicle-WeaponName}}} {{type=@{vehicle-WeaponName|max}}} {{atknotes= @{vehicle-WeaponNotes|max}} {{attack=[[1d20cs>@{WeaponCrit} + @{vehicle-AttackBAB} + @{vehicle-AttackBAB|max} + @{vehicle-int|max} + @{vehicle-attackModMisc} + @{vehicle-CT} + ?{Other Modifiers (Attack)|0}]]}} {{damage=[[(@{vehicle-damage} + @{vehicle-damageMisc})*@{vehicle-damage|max}]]}}" title="Attack Roll"> </button>
+						<td rowspan="2"> <button type="roll" name="roll_vehicle-WeaponCheck" value="&{template:attack} {{name=@{vehicle-WeaponName}}} {{type=@{vehicle-WeaponName|max}}} {{atkeffect= @{vehicle-WeaponNotes|max}} {{attack=[[1d20cs>@{WeaponCrit} + @{vehicle-AttackBAB} + @{vehicle-AttackBAB|max} + @{vehicle-int|max} + @{vehicle-attackModMisc} + @{vehicle-CT} + ?{Other Modifiers (Attack)|0}]]}} {{damage=[[(@{vehicle-damage} + @{vehicle-damageMisc})*@{vehicle-damage|max}]]}}" title="Attack Roll"> </button>
 						</td>
 					</tr>
 					<tr>					
@@ -1611,35 +1611,42 @@
 <br />
 <!-- start help section --> 
 <div> 
-For Help, please see the wiki page. <input type="text" name="attr_vehicle-EquipmentLocation" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/>
+For Help, please see the wiki page. <input type="text" name="attr_vehicle-EquipmentLocation" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/> <br/>
+<b>Last updated</b> 3/16/2015
 </div>
 
 <!-- start roll templates --> 
 
 <rolltemplate class="sheet-rolltemplate-attack">
-    <table>
+    <div style="width:100%; max-width:300px;">
+	<table>
 		<tr><th>{{name}}</th></tr>
 		<tr>{{#type}}<td class="subheader">{{type}}{{/type}}</td></tr>
 		<tr><td><span class="tcat">Attack: </span>{{attack}}</td></tr>
 		{{#damage}}		
-			<tr><td> 
-					<span class="tcat">Damage: </span>{{damage}}
-					{{#dmgcrit}}{{#rollWasCrit() attack}}
+			<tr><td>
+				<span class="tcat">Damage: </span>{{damage}}	
+				{{#dmgcrit}}					
+					{{#rollWasCrit() attack}}
 						<span class="tcat"> | Crit: </span>{{dmgcrit}}
-					{{/rollWasCrit() attack}}{{/dmgcrit}}
+					{{/rollWasCrit() attack}}	
+				{{/dmgcrit}}
 			</td></tr>
 		{{/damage}}
-		{{#atkffect}}
+		{{#atkeffect}}
 		<tr>
-			<td><span class="tcat">Notes: </span>{{atkffect}}</td>
+			<td><span class="tcat">Notes: </span>{{atkeffect}}</td>
 		</tr>
-		{{/atkffect}}
+		{{/atkeffect}}
     </table>
+	</div>
 </rolltemplate>
 <rolltemplate class="sheet-rolltemplate-skill">
+    <div style="width:100%; max-width:300px;">
     <table>
 		<tr><th>{{name}}</th> <td>{{skill}}</td></tr>
 		{{#crewname}}<tr><td colspan="2"><span class="tcat">{{crewname}}</span></td></tr>{{/crewname}}
 		{{#notes}}<tr><td colspan="2"><span class="tcat">Notes: </span>{{notes}}</td></tr>{{/notes}}
     </table>
+	</div>
 </rolltemplate>