diff --git a/Tavern-Tales/TavernTalesSheet.css b/Tavern-Tales/TavernTalesSheet.css
index 6a152c8c74..822fefe809 100644
--- a/Tavern-Tales/TavernTalesSheet.css
+++ b/Tavern-Tales/TavernTalesSheet.css
@@ -74,6 +74,13 @@
 }
 
 
+
+.sheet-stats {
+	text-align: center;
+	position: relative;
+}
+
+
 .sheet-combatDamage {
 /*
     margin: 0px;
@@ -87,8 +94,9 @@
 }
 
 .sheet-traitXP{
-	position: relative;
-    right: -89%;
+	position: absolute;
+    right: 5px;
+	top: 5px;
 	font-size: 0.5em;
 }
 
@@ -97,6 +105,7 @@
 	font-size: 1em;
 	padding: 0;
 	vertical-align: text-bottom;
+	-moz-appearance: textfield;
 }
 
 
@@ -335,6 +344,19 @@ input.sheet-hiddenSectionToggle:not(:checked) + span + div
 
 
 
+/*
+
+                                           
+		_/_/_/_/_/    _/_/    _/_/_/      _/_/_/   
+		   _/      _/    _/  _/    _/  _/          
+		  _/      _/_/_/_/  _/_/_/      _/_/       
+		 _/      _/    _/  _/    _/        _/      
+		_/      _/    _/  _/_/_/    _/_/_/      
+
+*/
+
+
+
 .sheet-traitsTabAllContent,
 .sheet-traitsTabCombatContent,
 .sheet-traitsTabExplorationContent,
@@ -343,48 +365,71 @@ input.sheet-hiddenSectionToggle:not(:checked) + span + div
 	display:none;
 }
 
-input.sheet-tab
-{
-width: 121px;
-height: 20px;
-position: relative;
-top: -2px;
-margin: 0px;
-cursor: pointer;
-z-index: 1;
-font-family: 'IM Fell English SC', serif;
+div.sheet-tab-widget-container {
+	position: relative;
+	display: inline-block;
+	width: 15%;
+	height: 20px;
+	top: -2px;
+	margin-left: -1px; /* To make up for spaces in the html between spans */
+	margin-right: -1px;
+	text-align: center;
+	vertical-align: middle;
 }
 
-input.sheet-tab::before
-{
-content: attr(title);
-border: solid 2px #E8E8E8;
-border-bottom: none;
-border-top-left-radius: 1em;
-border-top-right-radius: 1em;
-text-align: center;
-display: inline-block;
-width: 121px;
-height: 20px;
-font-size: 14px;
-font-weight: bold;
-background: burlywood;
+input.sheet-tab {
+	position: relative;
+	left: 0;
+	top: 0;
+	
+	width: 100%;
+	height: 100%;
+	margin: 0px;
+	cursor: pointer;
+	z-index: 1;
+	font-family: 'IM Fell English SC', serif;
 }
 
+input.sheet-tab + span::before {
+	content: attr(title);
+	color: black;
+}
 
-input.sheet-tab:checked::before
-{
+input.sheet-tab + span {
+	position: absolute;
+	top: 0;
+	left: 0;
+	pointer-events: none;
+
+	border: solid 2px #E8E8E8;
+	border-bottom: none;
+	border-top-left-radius: 1em;
+	border-top-right-radius: 1em;
+	text-align: center;
+	display: inline-block;
+	width: 100%;
+	height: 100%;
+	font-size: 14px;
+	font-weight: bold;
+	background: burlywood;
+	color: black;
+	z-index: 2;
+}
+
+input.sheet-tab:checked + span {
 	background: wheat;
-
 }
 
 
+
+
+
 	
-input.sheet-tab-all:checked ~ .sheet-traitsTabAllContent,
-input.sheet-tab-combat:checked ~ .sheet-traitsTabCombatContent,
-input.sheet-tab-exploration:checked ~ .sheet-traitsTabExplorationContent,
-input.sheet-tab-interaction:checked ~ .sheet-traitsTabInteractionContent,
-input.sheet-tab-general:checked ~ .sheet-traitsTabGeneralContent { /* show the correct tab */
+input[type="checkbox"][name="attr_traitTabs"][value="All"]:checked ~ .sheet-traitsTabAllContent,
+input[type="checkbox"][name="attr_traitTabs"][value="Combat"]:checked ~ .sheet-traitsTabCombatContent,
+input[type="checkbox"][name="attr_traitTabs"][value="Exploration"]:checked ~ .sheet-traitsTabExplorationContent,
+input[type="checkbox"][name="attr_traitTabs"][value="Interaction"]:checked ~ .sheet-traitsTabInteractionContent,
+input[type="checkbox"][name="attr_traitTabs"][value="General"]:checked ~ .sheet-traitsTabGeneralContent { /* show the correct tab */
 	display:block;	
 	background-color: wheat;
 	border-bottom-right-radius: 1em;
@@ -394,7 +439,7 @@ input.sheet-tab-general:checked ~ .sheet-traitsTabGeneralContent { /* show the c
 .sheet-traits {
 	margin: 0px;
 	padding: 10px;
-	
+	position: relative;
 }
 
 
@@ -410,6 +455,16 @@ input.sheet-tab-general:checked ~ .sheet-traitsTabGeneralContent { /* show the c
  */
  
  
+button[type="roll"].sheet-decreasedRoll:hover {
+	background-color: darkred;
+	background-position: 0 -25px;
+}
+
+button[type="roll"].sheet-increasedRoll:hover {
+	background-color: lightgreen;
+	background-position: 0 -25px;
+}
+
  
 .sheet-beliefs .repcontrol,
 .sheet-improvements .repcontrol,
@@ -420,13 +475,15 @@ input.sheet-tab-general:checked ~ .sheet-traitsTabGeneralContent { /* show the c
 }
 
 .repcontrol .btn {
-    visibility: hidden;
+    /* visibility: hidden; */ /* Stupid Firefox */
     border: medium none;
-    color: white !important;
+    color: transparent !important;
+	text-shadow: none !important;
     background: none;
     box-shadow: none;
 	float: none;
 	display: inline-block;
+	
 }
 
 .repcontrol .btn:focus {
diff --git a/Tavern-Tales/TavernTalesSheet.html b/Tavern-Tales/TavernTalesSheet.html
index 94db230de5..3387fbd1b1 100644
--- a/Tavern-Tales/TavernTalesSheet.html
+++ b/Tavern-Tales/TavernTalesSheet.html
@@ -72,7 +72,7 @@
 		
 			<div class="sheet-TavernTalesColumn">
 		
-				<div class="sheet-rollTabs">
+				<div class="sheet-stats">
 				
 
 					<h3><span class="sheet-traitXP">XP: <input type="number" name="attr_statXPSpent" value=0 /></span>Stats</h3>
@@ -87,7 +87,7 @@
 								<input type="number" name="attr_brawn" />
 							</td>
 							<td>
-								<button type='roll'  style="background-color:darkred"
+								<button type='roll'  class="sheet-decreasedRoll"
 									value='&{template:TTRoll} {{name=Decreased Brawn Test}} {{result=[[@{decreasedRollTemplate} + @{Brawn}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Brawn}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedBrawn'/>
 							</td>
@@ -100,7 +100,7 @@
 							</td>
 
 							<td>
-								<button type='roll'  style="background-color:lightgreen"
+								<button type='roll'  class="sheet-increasedRoll"
 									value='&{template:TTRoll} {{name=Increased Brawn Test}} {{result=[[@{increasedRollTemplate} + @{Brawn}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Brawn}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedBrawn'/>
 							</td>						
@@ -112,7 +112,7 @@
 						  <th>Mind: </th>
 						  <td><input type="number" name="attr_mind" /></td>
 							<td>
-								<button type='roll'  style="background-color:darkred"
+								<button type='roll'  class="sheet-decreasedRoll"
 									value='&{template:TTRoll} {{name=Decreased Mind Test}} {{result=[[@{decreasedRollTemplate} + @{Mind}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Mind}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedMind'/>
 							</td>
@@ -125,7 +125,7 @@
 							</td>
 
 							<td>
-								<button type='roll'  style="background-color:lightgreen"
+								<button type='roll'  class="sheet-increasedRoll"
 									value='&{template:TTRoll} {{name=Increased Mind Test}} {{result=[[@{increasedRollTemplate} + @{Mind}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Mind}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedMind'/>
 							</td>
@@ -135,7 +135,7 @@
 						  <th>Finesse: </th>
 						  <td><input type="number" name="attr_finesse" /></td>						  
 							<td>
-								<button type='roll'  style="background-color:darkred"
+								<button type='roll'  class="sheet-decreasedRoll"
 									value='&{template:TTRoll} {{name=Decreased Finesse Test}} {{result=[[@{decreasedRollTemplate} + @{Finesse}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Finesse}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedFinesse'/>
 							</td>
@@ -148,7 +148,7 @@
 							</td>
 
 							<td>
-								<button type='roll'  style="background-color:lightgreen"
+								<button type='roll'  class="sheet-increasedRoll"
 									value='&{template:TTRoll} {{name=Increased Finesse Test}} {{result=[[@{increasedRollTemplate} + @{Finesse}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Finesse}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedFinesse'/>
 							</td>
@@ -158,7 +158,7 @@
 						  <th>Spirit: </th>
 						  <td><input type="number" name="attr_spirit" /></td>
 							<td>
-								<button type='roll'  style="background-color:darkred"
+								<button type='roll'  class="sheet-decreasedRoll"
 									value='&{template:TTRoll} {{name=Decreased Spirit Test}} {{result=[[@{decreasedRollTemplate} + @{Spirit}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Spirit}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedSpirit'/>
 							</td>
@@ -171,7 +171,7 @@
 							</td>
 
 							<td>
-								<button type='roll'  style="background-color:lightgreen"
+								<button type='roll'  class="sheet-increasedRoll"
 									value='&{template:TTRoll} {{name=Increased Spirit Test}} {{result=[[@{increasedRollTemplate} + @{Spirit}]]}} {{lowerLimit=[[@{lowerLimit}]]}} {{upperLimit=[[@{upperLimit}]]}} {{rollDescription=Rolling @{diceType} Spirit}} {{notes=?{What are you trying to achieve} }} {{characterName=@{CharacterName}}}'
 									name='roll_DecreasedSpirit'/>
 							</td>
@@ -304,12 +304,17 @@
 		
 		<div class="sheet-rollTabs">
 		
-
-			<input type="radio" name="traitTabs" value="Combat" class="sheet-tab sheet-tab-combat" id="sheet-traitsTabCombat" title="Combat" />
-			<input type="radio" name="traitTabs" value="Exploration" class="sheet-tab sheet-tab-exploration" id="sheet-traitsTabExploration" title="Exploration" />
-			<input type="radio" name="traitTabs" value="Interaction" class="sheet-tab sheet-tab-interaction" id="sheet-traitsTabInteraction" title="Interaction" />
-			<input type="radio" name="traitTabs" value="General" class="sheet-tab sheet-tab-general" id="sheet-traitsTabGeneral" title="General" />
-			<input type="radio" name="traitTabs" value="All" class="sheet-tab sheet-tab-all" id="sheet-traitsTabAll" checked="checked" title="All" />					
+			<input type="checkbox" name="attr_traitTabs" class="sheet-HiddenCheckbox" value="Combat"/>
+			<input type="checkbox" name="attr_traitTabs" class="sheet-HiddenCheckbox" value="Exploration"/>
+			<input type="checkbox" name="attr_traitTabs" class="sheet-HiddenCheckbox" value="Interaction"/>
+			<input type="checkbox" name="attr_traitTabs" class="sheet-HiddenCheckbox" value="General"/>
+			<input type="checkbox" name="attr_traitTabs" class="sheet-HiddenCheckbox" value="All"/>
+			
+			<div class="sheet-tab-widget-container"><input type="radio" name="attr_traitTabs" value="Combat" class="sheet-tab sheet-tab-combat" id="sheet-traitsTabCombat" title="Combat" /><span title="Combat"></span></div>
+			<div class="sheet-tab-widget-container"><input type="radio" name="attr_traitTabs" value="Exploration" class="sheet-tab sheet-tab-exploration" id="sheet-traitsTabExploration" title="Exploration" /><span title="Exploration"></span></div>
+			<div class="sheet-tab-widget-container"><input type="radio" name="attr_traitTabs" value="Interaction" class="sheet-tab sheet-tab-interaction" id="sheet-traitsTabInteraction" title="Interaction" /><span title="Interaction"></span></div>
+			<div class="sheet-tab-widget-container"><input type="radio" name="attr_traitTabs" value="General" class="sheet-tab sheet-tab-general" id="sheet-traitsTabGeneral" title="General" /><span title="General"></span></div>
+			<div class="sheet-tab-widget-container"><input type="radio" name="attr_traitTabs" value="All" class="sheet-tab sheet-tab-all" id="sheet-traitsTabAll" checked="checked" title="All" /><span title="All"></span></div>
 
 
 			<div class="sheet-traitsTabCombatContent">
@@ -370,6 +375,10 @@
 				
 				<div class="sheet-traits">
 					<h2><span class="sheet-traitXP">XP: <input type="number" name="attr_totalTraitXPSpent" disabled="true" value="(@{combatTraitsXPSpent} + @{explorationTraitsXPSpent} + @{interactionTraitsXPSpent} + @{generalTraitsXPSpent})" /></span>All Traits</h2>
+					
+				</div>
+				<div class="sheet-traits">
+					
 					<h3><span class="sheet-traitXP">XP: <input type="number" name="attr_combatTraitsXPSpent" value=0 /></span>Combat</h3>
 					<fieldset class="repeating_CombatTraits">
 						<div class="sheet-singleTraitContainer">					
@@ -377,6 +386,9 @@
 							<textarea class="sheet-TTtraitDesc" name="attr_CombatTraitDescription" placeholder="Trait Description"></textarea>
 						</div>
 					</fieldset>
+				</div>
+				
+				<div class="sheet-traits">
 
 					<h3><span class="sheet-traitXP">XP: <input type="number" name="attr_explorationTraitsXPSpent" value=0 /></span>Exploration</h3>							
 					<fieldset class="repeating_ExplorationTraits">
@@ -385,7 +397,8 @@
 							<textarea class="sheet-TTtraitDesc" name="attr_ExplorationTraitDescription" placeholder="Trait Description"></textarea>
 						</div>
 					</fieldset>
-
+				</div>
+				<div class="sheet-traits">
 					<h3><span class="sheet-traitXP">XP: <input type="number" name="attr_interactionTraitsXPSpent" value=0 /></span>Interaction</h3>
 					<fieldset class="repeating_InteractionTraits">
 						<div class="sheet-singleTraitContainer">					
@@ -394,7 +407,8 @@
 						</div>
 					</fieldset>
 
-
+				</div>
+				<div class="sheet-traits">
 					<h3><span class="sheet-traitXP">XP: <input type="number" name="attr_generalTraitsXPSpent" value=0 /></span>General</h3>
 					<fieldset class="repeating_GeneralTraits">
 						<div class="sheet-singleTraitContainer">					
@@ -583,13 +597,13 @@ d88' `88b d88' `888  `888  `888  `888   888' `88b
 				<h3>Target Numbers</h3>
 				<p>The default difficulty is as follows: 
 				<ul>
-					<li>Rolling 8 or more gets a good tale</li>
-					<li>Rolling 13 or less gets a bad tale</li>
+					<li>Rolling 10 or more gets a good tale</li>
+					<li>Rolling 15 or less gets a bad tale</li>
 				</ul>
-				<p>These target number (DCs) are fairly easy to hit. If you want a much harder game, consider setting them to 10 and 15</p>
-				<p>Lower Margin: <input type="number" name="attr_lowerLimit" value="8" /> Roll this value or higher to get a Good Tale</p>
-				<p>Upper Margin: <input type="number" name="attr_upperLimit" value="13" /> Roll this value or lower to get a Bad Tale</p>
-				<p>Make sure these fields are not empty. If you're not sure, set them to 8, 13.</p>
+				<p>If this is too hard, consider changing the target numbers to 8 and 13.</p>
+				<p>Lower Margin: <input type="number" name="attr_lowerLimit" value="10" /> Roll this value or higher to get a Good Tale</p>
+				<p>Upper Margin: <input type="number" name="attr_upperLimit" value="15" /> Roll this value or lower to get a Bad Tale</p>
+				<p>Make sure these fields are not empty. If you're not sure, set them to 10, 15.</p>
 			</div>
 			
 			<div class="sheet-TavernTalesColumn">
@@ -597,8 +611,8 @@ d88' `88b d88' `888  `888  `888  `888   888' `88b
 				<p>
 					Set your Roll type: 3d20 or 2d10 
 					<select name="attr_diceType">
-						<option label="3d20" value="3d20" selected="selected">
-						<option label="2d10" value="2d10">
+						<option label="3d20" value="3d20" selected="selected">3d20</option>
+						<option label="2d10" value="2d10">2d10</option>
 					</select>
 				</p>