diff --git a/index.html b/index.html
index fa28c44..94c0ed1 100755
--- a/index.html
+++ b/index.html
@@ -56,7 +56,7 @@
 
         <section id="sectionKeypads">
             <h2>Keypads</h2>
-            <div><button class="jsResetSection">Reset</button></div>
+            <button class="jsResetSection">Reset</button>
         </section>
 
         <section id="sectionSimon">
@@ -113,6 +113,7 @@
 
         <section id="sectionMemory">
             <h2>Memory</h2>
+            <button class="jsResetSection">Reset</button>
             <table>
                 <tr>
                     <th>Stage</th>
@@ -151,8 +152,6 @@
                     <td><input type="text" maxlength="1" id="stage_5_label" /></td>
                 </tr>
             </table>
-
-            <button class="jsResetSection">Reset</button>
         </section>
 
         <section id="sectionMorse">
@@ -200,6 +199,7 @@
 
         <section id="passwords">
             <h2>Passwords</h2>
+            <button class="jsResetSection">Reset</button>
             <table id="passwords"></table>
             <ul id="passwordOptions">
                 <li><input type="text" /></li>
@@ -208,7 +208,6 @@
                 <li><input type="text" /></li>
                 <li><input type="text" /></li>
             </ul>
-            <button class="jsResetSection">Reset</button>
         </section>
 
 
diff --git a/ktane.css b/ktane.css
index f1d2f83..cca283c 100755
--- a/ktane.css
+++ b/ktane.css
@@ -87,7 +87,7 @@ h2 {
 }
 
 .jsResetSection {
-    margin-top: 1em;
+    display: block;
 }
 
 nav {
@@ -141,7 +141,7 @@ nav {
     border-width: 1px;
 }
 #buttonInstruction {
-    background-color: #ddd;
+    background-color: #eee;
     padding: 0.5em;
 }
 
@@ -161,10 +161,10 @@ nav {
     border-bottom: 1px solid black;
 }
 #sectionKeypads .selected {
-    background: #ff6;
+    background-color: #ff6;
 }
 #sectionKeypads ul[data-count='4'] .selected {
-    background: lightgreen;
+    background-color: lightgreen;
 }
 
 #simonInputs {
@@ -327,6 +327,9 @@ nav {
     border: 1px solid black;
 }
 
+#sectionMemory table {
+    margin-top: 1em;
+}
 #sectionMemory td {
     text-align: right;
 }
diff --git a/ktane.js b/ktane.js
index fb5950d..ecb4ae8 100755
--- a/ktane.js
+++ b/ktane.js
@@ -645,7 +645,7 @@ $('section').each(function () {
         });
 
         $instruction.html(instructions[conditions[checked[0]][checked[1]][checked[2]][checked[3]]]);
-    });
+    }).triggerHandler('change');
 })();
 
 (function () {
@@ -687,7 +687,7 @@ $('section').each(function () {
         regex = new RegExp(pattern);
 
         $passwords.forEach(function ($password) {
-            $password.toggleClass("inactive", !$password.text().match(regex));
+            $password.toggleClass('inactive', !$password.text().match(regex));
         });
     });
 })();