diff --git a/Neon City Overdrive/NCO_charactersheet.html b/Neon City Overdrive/NCO_charactersheet.html
index 5d5d45f09c..35ec606774 100644
--- a/Neon City Overdrive/NCO_charactersheet.html	
+++ b/Neon City Overdrive/NCO_charactersheet.html	
@@ -149,31 +149,30 @@
                     <input type="checkbox" name="attr_hit_4"/>
                 </div>
                 <h3>Conditions</h3>
-                <table class="conditions">
-                    <tr>
-                      <td><input type="checkbox" name="attr_angry"/><span>Angry</span></td>
-                      <td><input type="checkbox" name="attr_dazed"/><span>Dazed</span></td>
-                      <td><input type="checkbox" name="attr_exhausted"/><span>Exhausted</span></td>
-                    </tr>
-                    <tr>
-                      <td><input type="checkbox" name="attr_scared"/><span>Scared</span></td>
-                      <td><input type="checkbox" name="attr_restrained"/><span>Restrained</span></td>
-                      <td><input type="checkbox" name="attr_weakened"/><span>Weakened</span></td>
-                    </tr>
-                    <tr>
-                      <td colspan="3">
-                        <input type="checkbox" name="attr_free_conditon_1"/>
-                        <input type="text" name="attr_free_conditon_text_1"/>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td colspan="3">
-                        <input type="checkbox" name="attr_free_conditon_2"/>
-
-                        <input type="text" name="attr_free_conditon_text_2"/>
-                      </td>
-                    </tr>
-                </table>
+                <div class="conditions">
+                    <div>
+                        <span><input type="checkbox" name="attr_angry"/><span>Angry</span></span>
+                        <span><input type="checkbox" name="attr_dazed"/><span>Dazed</span></span>
+                        <span><input type="checkbox" name="attr_exhausted"/><span>Exhausted</span></span>
+                    </div>
+                    <div>
+                        <span><input type="checkbox" name="attr_scared"/><span>Scared</span></span>
+                        <span><input type="checkbox" name="attr_restrained"/><span>Restrained</span></span>
+                        <span><input type="checkbox" name="attr_weakened"/><span>Weakened</span></span>
+                    </div>
+                    <div class="free">
+                        <span>
+                            <input type="checkbox" name="attr_free_conditon_1"/>
+                            <input type="text" name="attr_free_conditon_text_1"/>
+                        </span>
+                    </div>
+                    <div class="free">
+                        <span>
+                            <input type="checkbox" name="attr_free_conditon_2"/>
+                            <input type="text" name="attr_free_conditon_text_2"/>
+                        </span>
+                    </div>
+                </div>
                 <h3>Traumas</h3>
                 <ul class="traumas">
                     <li><i class="minus"></i><input type="text" name="attr_trauma1"/></li>
@@ -182,27 +181,26 @@
                     <li><i class="minus"></i><input type="text" name="attr_trauma4"/></li>
                 </ul>
                 <h3>Flaws</h3>
-                <ul class="flaws border">
+                <ul class="flaws">
                     <li><i class="minus"></i><input type="text" name="attr_flaw1"/></li>
                     <li><i class="minus"></i><input type="text" name="attr_flaw1"/></li>
                 </ul>
-                <table class="stunts border">
-                    <tr>
-                      <td></td>
-                      <td>Base</td>
-                      <td>Current</td>
-                    </tr>
-                    <tr>
-                      <td><h3>Stunt Points</h3></td>
-                      <td><input type="number" name="attr_stunt_base"></td>
-                      <td><input type="number" name="attr_stunt_current"></td>
-                    </tr>
-                </table>
+                <div class="stunts border">
+                    <span>
+                        <h3>Stunt Points</h3>
+                    </span>
+                    <span>
+                        <input type="number" name="attr_stunt_base" min="0" max="3"> /
+                    </span>
+                    <span>
+                        <input type="number" name="attr_stunt_current" min="0" max="3">
+                    </span>
+                </div>
                 <h3 class="gears_h3">Gears</h3>
                 <i>Basic</i>
-                <textarea class="gears border"></textarea>
+                <textarea class="gears border" name="attr_basicGears"></textarea>
                 <i>Special</i>
-                <textarea class="gears border"></textarea>
+                <textarea class="gears border" name="attr_specialGears"></textarea>
                 <h3>Drive</h3>
                 <div class="drive border">
                     <input type="text" name="attr_drive"/>
@@ -244,7 +242,7 @@
 
 <script type="text/worker">
     on('clicked:roll', (info) => {
-        startRoll("&{template:roll} {{name=@{character_name} Roll}} {{roll1=[[?{Action dices|1|2|3|4|5}d6+?{Danger dices|0|1|2|3|4|5}d6]]}} {{action=?{Action dices|1|2|3|4|5}}} {{danger=?{Danger dices|0|1|2|3|4|5}}}", (results) => {
+        startRoll("&{template:roll} {{name=@{character_name} Roll}} {{roll1=[[?{Action dices|1|2|3|4|5|6|7|8|9|10}d6+?{Danger dices|0|1|2|3|4|5|6|7|8|9|10}d6]]}} {{action=?{Action dices|1|2|3|4|5|6|7|8|9|10}}} {{danger=?{Danger dices|0|1|2|3|4|5|6|7|8|9|10}}}", (results) => {
             console.log(results);
             console.log(results.results.roll1.rolls[0].results);
             
diff --git a/Neon City Overdrive/NCO_stylesheet.css b/Neon City Overdrive/NCO_stylesheet.css
index 7d58bec869..6aed4cdfd5 100644
--- a/Neon City Overdrive/NCO_stylesheet.css	
+++ b/Neon City Overdrive/NCO_stylesheet.css	
@@ -9,10 +9,6 @@ h3 {
     font-family: system-ui;
 }
 
-table {
-    width: 100%;
-}
-
 i {
     margin-top: -10px;
     float: right;
@@ -65,14 +61,29 @@ div.sheet-columns       { width: 680px;  margin: 0 auto;}
     margin-bottom: 3px;
     margin-top: 0;
 }
-.sheet-stunts tr td {
-    width: 80px;
-}
-input[type="number"] {
-    width: 80%;
-    height: 80%;
-    text-align: center;
 
+
+.sheet-stunts {
+    background-color: indigo;
+    color: white;
+}
+
+.sheet-stunts span {
+    display: inline-block;
+    margin-left: 10px;
+}
+
+.sheet-stunts span h3 {
+    color: white;
+}
+
+.sheet-stunts span input[type="number"] {
+    width: 70px;
+    height: 40px;
+    text-align: center;
+    border: 1px solid indigo;
+    color: indigo;
+    font-size:2em;
 }
 
 input[type="checkbox"] {
@@ -80,6 +91,17 @@ input[type="checkbox"] {
     background: palevioletred;
 }
 
+
+.sheet-conditions div span {
+    width: 30%;
+    display: inline-block;
+}
+
+.sheet-conditions div.sheet-free span {
+    width: 100%;
+}
+
+
 .sheet-conditions input[type="text"] {
     width: 91%;
 }
diff --git a/Neon City Overdrive/sheet.json b/Neon City Overdrive/sheet.json
index fac595e0cc..1c25a40e02 100644
--- a/Neon City Overdrive/sheet.json	
+++ b/Neon City Overdrive/sheet.json	
@@ -4,6 +4,6 @@
   "authors": "micka9fr",
   "roll20userid": "812421",
   "preview": "preview.png",
-  "instructions": "It's non official sheet for the game Neon City Overdrive (NCO) written by Nathan RUSSELL.",
+  "instructions": "It's non official sheet for the game Neon City Overdrive (NCO) written by Nathan RUSSELL. Don't forget to click on the 'edit' button to unlock the sheet",
   "legacy": true
 }
\ No newline at end of file