diff --git a/CypherSystem/CypherSystem.htm b/CypherSystem/CypherSystem.htm
index ac2a207eef..e1ca60dec2 100644
--- a/CypherSystem/CypherSystem.htm
+++ b/CypherSystem/CypherSystem.htm
@@ -260,12 +260,12 @@
                         <fieldset class="repeating_abilities">
                             <div class="sheet-text2">
                                 Name&nbsp;
-                            	<input type="text" style="width: 190px;font-weight: bold;" name="attr_abilityname" title="Ability name"s placeholder="Name" />
-                            	<select name="attr_abilityuse" style="width: 90px;" title="Eventual conditions of use of this ability: enabler, action, once a day etc.">
-                            		<option selected="selected">Action</option>
-                            		<option>Enabler</option>
-                            		<option>Other</option>
-                            	</select>
+                                <input type="text" style="width: 190px;font-weight: bold;" name="attr_abilityname" title="Ability name"s placeholder="Name" />
+                                <select name="attr_abilityuse" style="width: 90px;" title="Eventual conditions of use of this ability: enabler, action, once a day etc.">
+                                    <option selected="selected">Action</option>
+                                    <option>Enabler</option>
+                                    <option>Other</option>
+                                </select>
                             </div>
                             <div><textarea style="height: 46px" name="attr_abilitydesc" title="Ability description" placeholder="Description and notes"></textarea></div>
                         </fieldset>
@@ -463,7 +463,7 @@
         </td> <!-- END COL 2 -->
         <!-- ******* COL 3 **************** -->
         <td valign="top"> <!-- COL 3 -->
-            <img src="https://lh3.googleusercontent.com/fg-zJE6F2n1LMFOHWPO_195mxKsbXXxqIPT2F91XI_LoDCCeizFmTKjwQPWHt7RUF7g9qVidhj-ebigqlJ0UgKktSNjfJb9ltF0AMhGoYX7SDrZyylDjAHRPkmRyS0gmnvx45OO829A9rxfcx6tq9NOvVKFru0M8H_iC4K-7rl_zN80Vl9Wn5GcvTgRpeNN0wyuFaPq2x2yyukk4zAGNscNofBLgDWGuEKJDf4ZMcQ7a9gg8UrCMAuixcGiYn_MWUZ5omd8ug_0JyF2UDHaqmKKIfQ2Bm6fbQxNd_vEXhkZvg_3Iwsd6CwW9Wxf8Mtdp8qH-T1ESf_yK_8dl-2qUdEzc7c3S0vqzm-pvf_lM05IbMsWDjc9nX2ev6ZdVc8VUddr0yuwqsLUEkyTAjlMLI2DmJ8-ZWx9qxM_qbY7CPVw5PvjkrheT_BeSLabIwVx8aAbMF68WBYAmo3J47rDR51lEzSCegle23evJ_3g70UrkwGbdFWW_ExJ_3biZ_7xdDkSdWlKCnE2zvG9KCbtO_GZJ1KGlpKP6eEAdeSLq4gz2=w900-h263-no" width="330px"/>
+            <img src="https://lh4.googleusercontent.com/-T_PWRmd-TxE/Vfs9cEqYWbI/AAAAAAAAW0I/rUC1JdU-UXg/w900-h263/Roll20_cypher_logo.png" width="330px"/>
             <div class="sheet-supblock"> <!-- CYPHERS -->
                 <div class="sheet-blublock">
                     <div class="sheet-inpblock">
@@ -481,10 +481,10 @@
                                 Name&nbsp;
                                 <input type="text" style="width: 210px;font-weight: bold;" name="attr_cypher-name" title="Name of the cypher" placeholder="Cypher" />
                                 Lvl&nbsp;
-								<input type="number" style="width: 40px;" name="attr_cypher-level" title="Level of the Cypher" min="0" value="1" />
+                                <input type="number" style="width: 40px;" name="attr_cypher-level" title="Level of the Cypher" min="0" value="1" />
                             </div>
                             <div>
-								<textarea name="attr_cypher-description" style="height: 46px; width: 100%;" title="Description of the Cypher" placeholder="Description"></textarea>
+                                <textarea name="attr_cypher-description" style="height: 46px; width: 100%;" title="Description of the Cypher" placeholder="Description"></textarea>
                             </div>
                         </fieldset>
                     </div>
@@ -730,32 +730,14 @@
             {{/rollLess() targetRoll target}}
         {{/rollGreater() difficulty 0}}
         {{#rollTotal() difficulty 0}}
-            {{#rollWasFumble() diceRollNoDiff}}
-                <tr><td COLSPAN="2" style="font-size:105%;color:red;text-align:center;font-weight:bold;">GM Intrusion</td></tr>
-            {{/rollWasFumble() diceRollNoDiff}}
-            {{#rollWasCrit() diceRollNoDiff}}
-                <tr><td COLSPAN="2" style="color:green;text-align:center;font-weight:bold;">Special Roll! (17+)</td></tr>
-            {{/rollWasCrit() diceRollNoDiff}}
-            <tr>
-                <td style="font-weight:bold;white-space: nowrap;" title="Difficulty beaten by the roll">Beaten diff.</td>
-                <td style="text-align:center;font-weight:bold;">
-                    {{#rollLess() diceRollNoDiff 3}}0{{/rollLess() diceRollNoDiff 3}}
-                    {{#rollBetween() diceRollNoDiff 3 5}}1{{/rollBetween() diceRollNoDiff 3 5}}
-                    {{#rollBetween() diceRollNoDiff 6 8}}2{{/rollBetween() diceRollNoDiff 6 8}}
-                    {{#rollBetween() diceRollNoDiff 9 11}}3{{/rollBetween() diceRollNoDiff 9 11}}
-                    {{#rollBetween() diceRollNoDiff 12 14}}4{{/rollBetween() diceRollNoDiff 12 14}}
-                    {{#rollBetween() diceRollNoDiff 15 17}}5{{/rollBetween() diceRollNoDiff 15 17}}
-                    {{#rollBetween() diceRollNoDiff 18 20}}6{{/rollBetween() diceRollNoDiff 18 20}}
-                    {{#rollBetween() diceRollNoDiff 21 23}}7{{/rollBetween() diceRollNoDiff 21 23}}
-                    {{#rollBetween() diceRollNoDiff 24 26}}8{{/rollBetween() diceRollNoDiff 24 26}}
-                    {{#rollBetween() diceRollNoDiff 27 29}}9{{/rollBetween() diceRollNoDiff 27 29}}
-                    {{#rollGreater() diceRollNoDiff 29}}10+{{/rollGreater() diceRollNoDiff 29}}
-                     ({{diceRollNoDiff}})
-                </td>
-            </tr>
-            {{#rollGreater() bonusToRoll 0}}
-                <tr><td>Bonus</td><td><i>1d20+{{bonusToRoll}}</i></td></tr>
-            {{/rollGreater() bonusToRoll 0}}
+                <tr>
+                    <td>1d20</td>
+                    <td>
+                        {{#rollGreater() bonusToRoll 0}}
+                            <i>+{{bonusToRoll}} (bonus)</i>
+                        {{/rollGreater() bonusToRoll 0}}
+                    </td>
+                </tr>
             {{#skilled}}
                 <tr>
                     {{#rollTotal() skilled -1}}
@@ -778,6 +760,29 @@
             {{#rollGreater() effortRoll 0}}
                 <tr><td>Effort</td><td><i>+ {{effortRoll}} (x3)</i></td></tr>
             {{/rollGreater() effortRoll 0}}
+            <tr>
+                <td style="font-weight:bold;white-space: nowrap;" title="Difficulty beaten by the roll">Beaten diff.</td>
+                <td style="text-align:center;font-weight:bold;">=
+                    {{#rollLess() diceRollNoDiff 3}}0{{/rollLess() diceRollNoDiff 3}}
+                    {{#rollBetween() diceRollNoDiff 3 5}}1{{/rollBetween() diceRollNoDiff 3 5}}
+                    {{#rollBetween() diceRollNoDiff 6 8}}2{{/rollBetween() diceRollNoDiff 6 8}}
+                    {{#rollBetween() diceRollNoDiff 9 11}}3{{/rollBetween() diceRollNoDiff 9 11}}
+                    {{#rollBetween() diceRollNoDiff 12 14}}4{{/rollBetween() diceRollNoDiff 12 14}}
+                    {{#rollBetween() diceRollNoDiff 15 17}}5{{/rollBetween() diceRollNoDiff 15 17}}
+                    {{#rollBetween() diceRollNoDiff 18 20}}6{{/rollBetween() diceRollNoDiff 18 20}}
+                    {{#rollBetween() diceRollNoDiff 21 23}}7{{/rollBetween() diceRollNoDiff 21 23}}
+                    {{#rollBetween() diceRollNoDiff 24 26}}8{{/rollBetween() diceRollNoDiff 24 26}}
+                    {{#rollBetween() diceRollNoDiff 27 29}}9{{/rollBetween() diceRollNoDiff 27 29}}
+                    {{#rollGreater() diceRollNoDiff 29}}10+{{/rollGreater() diceRollNoDiff 29}}
+                     ({{diceRollNoDiff}})
+                </td>
+            </tr>
+            {{#rollWasFumble() diceRollNoDiff}}
+                <tr><td COLSPAN="2" style="font-size:105%;color:red;text-align:center;font-weight:bold;">GM Intrusion</td></tr>
+            {{/rollWasFumble() diceRollNoDiff}}
+            {{#rollWasCrit() diceRollNoDiff}}
+                <tr><td COLSPAN="2" style="color:green;text-align:center;font-weight:bold;">Special Roll! (17+)</td></tr>
+            {{/rollWasCrit() diceRollNoDiff}}
         {{/rollTotal() difficulty 0}}
         {{#rollGreater() effortDmg 0}}
             <tr><td COLSPAN="2"><hr/></td></tr>