diff --git a/AGE System/AGE System.css b/AGE System/AGE System.css
index 676062a144..30fc5e008e 100644
--- a/AGE System/AGE System.css	
+++ b/AGE System/AGE System.css	
@@ -339,14 +339,17 @@ input {
 }
 
 .sheet-ability-name button[type=roll]::before,
-.sheet-ability-focus-list button[type=roll]::before { 
+.sheet-ability-focus-list button[type=roll]::before,
+.sheet-spell-short-container button[type=roll]::before { 
 		content: "";
 }
 
 .sheet-ability-name button[type=roll]:hover,
 .sheet-ability-name button[type=roll]:hover *,
 .sheet-ability-focus-list button[type=roll]:hover,
-.sheet-ability-focus-list button[type=roll]:hover * { 
+.sheet-ability-focus-list button[type=roll]:hover *,
+.sheet-spell-short-container button[type=roll]:hover,
+.sheet-spell-short-container button[type=roll]:hover * { 
 		color: #EC2127;
 }
 
@@ -426,7 +429,7 @@ input {
 .sheet-ability-focus-list {
 		width: 100%;
 		min-height: 44px;
-		background: #f7f7f7;
+		background: #f5f5f5;
 }
 
 .sheet-ability-focus-list button[type=roll] {
@@ -446,12 +449,9 @@ input {
 		margin: 0px;
 }
 
-.sheet-ability-focus-list .repitem:last-child .sheet-focus-comma {
-		display:none;
-}
-
+.sheet-ability-focus-list .repitem:last-child .sheet-focus-comma,
 .sheet-ability-focus-list .repcontrol {
-		display: none;
+		display:none;
 }
 
 	/* Right column */
@@ -841,12 +841,24 @@ input {
 }
 
 .sheet-spell-short-description {
-		width: 248px;
+		width: 265.4px;
 		margin-bottom: 1px;
 }
 
 .sheet-spell-short-container button[type=roll] {
-		margin-top: 10px;
+		width: 100%;
+		display: inline-block;
+		border: none;
+		background: none;
+		box-shadow: none;
+		font-size: 12px;
+		padding-right: 0px;
+		margin-top: 11px;
+		color: black;
+}
+
+.sheet-spell-short-container textarea {
+		background-color:#FFF !important;
 }
 
 .sheet-money-section { 
diff --git a/AGE System/AGE System.html b/AGE System/AGE System.html
index 188b929782..afc4583288 100644
--- a/AGE System/AGE System.html	
+++ b/AGE System/AGE System.html	
@@ -602,21 +602,17 @@
 							<div class="col repeatingcol spell-short-description">
 								<span data-i18n="short-description-u">SHORT DESCRIPTION</span>
 							</div>
-							<div class="col repeatingcol spell-short-roll">
-							</div>
 						</div>
 						<fieldset class="repeating_spell">
+							<input type="hidden" name="attr_spell-name">
 							<input type="hidden" name="attr_spell-focus-bonus">
 							<input type="hidden" name="attr_spell-tn">
 							<input type="hidden" name="attr_spell-spellpower">
 							<div class="col repeatingcol spell-short-name">
-								<input type="text" name="attr_spell-name">
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{Magic}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"><span name="attr_spell-name"></span></button>
 							</div>
 							<div class="col repeatingcol spell-short-description">
-								<textarea name="attr_short-spell-description"></textarea>
-							</div>
-							<div class="col repeatingcol">
-								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Magic=+ [[@{Magic}]]}}{{Magic Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"></button>
+								<textarea name="attr_short-spell-description" readonly="true"></textarea>
 							</div>
 						</fieldset>
 					</div>
@@ -628,22 +624,18 @@
 							<div class="col repeatingcol spell-short-description">
 								<span data-i18n="short-description-u">SHORT DESCRIPTION</span>
 							</div>
-							<div class="col repeatingcol spell-short-roll">
-							</div>
 						</div>
 						<fieldset class="repeating_spell">
+							<input type="hidden" name="attr_spell-name">
 							<input type="hidden" name="attr_spell-focus-bonus">
 							<input type="hidden" name="attr_spell-tn">
 							<input type="hidden" name="attr_spell-spellpower">
 							<div class="col repeatingcol spell-short-name">
-								<input type="text" name="attr_spell-name">
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Intelligence=+ [[@{Intelligence}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"><span name="attr_spell-name"></span></button>
 							</div>
 							<div class="col repeatingcol spell-short-description">
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
-							<div class="col repeatingcol">
-								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Intelligence=+ [[@{Intelligence}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Spellpower=@{spell-spellpower}}}" name="roll_spell_check"></button>
-							</div>
 						</fieldset>
 					</div>
 					<div class="section sectionfull spell-short-container blue-rose-selected">
@@ -654,23 +646,19 @@
 							<div class="col repeatingcol spell-short-description">
 								<span data-i18n="short-description-u">SHORT DESCRIPTION</span>
 							</div>
-							<div class="col repeatingcol spell-short-roll">
-							</div>
 						</div>
 						<fieldset class="repeating_spell">
+							<input type="hidden" name="attr_spell-name">
 							<input type="hidden" name="attr_spell-ability-score">
 							<input type="hidden" name="attr_spell-focus-bonus">
 							<input type="hidden" name="attr_spell-tn">
 							<input type="hidden" name="attr_spell-fatigue">
 							<div class="col repeatingcol spell-short-name">
-								<input type="text" name="attr_spell-name">
+								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{spell-ability-score}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Fatigue TN=@{spell-fatigue}}}" name="roll_spell_check"><span name="attr_spell-name"></span></button>
 							</div>
 							<div class="col repeatingcol spell-short-description">
 								<textarea name="attr_short-spell-description"></textarea>
 							</div>
-							<div class="col repeatingcol">
-								<button class="spell-magic-buttons" type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{spell-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Ability=+ [[@{spell-ability-score}]]}}{{Arcana Focus=+ [[@{spell-focus-bonus}]]}}{{TN=@{spell-tn}}}{{Fatigue TN=@{spell-fatigue}}}" name="roll_spell_check"></button>
-							</div>
 						</fieldset>
 					</div>
 				</div>