--- tour/index.html
+++ tour/index.2.html
@@ -36,14 +36,41 @@
     margin: 2em 0 1.5em;
 }
-p, ul {
+p {
     margin: 0 0 1.5em 0;
 }
+kbd {
+    font-size: larger;
+    background: #ffe;
+}
+#content pre {
+    width: 12em;
+    margin: 0 auto 1.5em;
+}
+
+/* Lists */
+ul, ol  {
+    padding: 0 5%;
+    margin: 0 0 1.5em 0;
+}
+ol li {
+    list-style-type: decimal;
+}
+li {
+    margin: 0 0 .7em 1em;
+}
+ul.replace {
+    padding: .7em 5%;
+    background: white;
+}
+ul.replace li:last-child {
+    margin-bottom: 0;
+}
 dt {
-    padding: .8em 3% 0;
+    padding: .7em 3% 0;
     margin: 0;
 }
 dd {
-    padding: .5em 6% .8em;
-    margin: 0 0 8px;
+    padding: .5em 8% .7em;
+    margin: 0 0 .5em;
 }
 dd p {
@@ -56,12 +83,4 @@
     background: white;
 }
-kbd {
-    font-size: larger;
-    background: #ffe;
-}
-#content pre {
-    width: 12em;
-    margin: 0 auto 1.5em;
-}
 
 /* Images */
@@ -129,4 +148,5 @@
 /* Tables */
 table {
+    table-layout: fixed;
     width: 100%;
     background: white;
@@ -135,19 +155,19 @@
 td {
     vertical-align: middle;
-    padding: .5em 1em;
+    padding: .5em 1em .3em;
 }
-.commands td, .lists td {
+.commands tr, .lists tr {
     border-bottom: 4px solid #f5f5ed;
 }
 .commands td:first-child, .lists td:first-child {
     text-align: right;
-    width: 30%;
-    border-right: 2px solid #f5f5ed;
+    width: 28%;
+    padding-right: 0;
 }
 .commands.calculate td:first-child {
-    width: 42%;
+    width: 40%;
 }
 .commands.modes td:first-child {
-    width: 48%;
+    width: 43%;
 }
 .lists {
@@ -157,8 +177,4 @@
     margin: 0;
 }
-.lists.third td:first-child {
-    width: 40%; 
-    margin: 0;
-}
 .operations {
     table-layout: fixed;
@@ -180,4 +196,41 @@
 }
 
+@media (max-width: 35em) {
+  .commands td {
+    display: block;
+  }
+  .lists td {
+    display: inline-block;
+  }
+  .commands td, .lists td {
+    padding: 0;
+    border: none;
+  }
+  .commands td:first-child, .lists td:first-child {
+    width: auto;
+    text-align: left;
+    position: relative;
+    right: 1em;
+    margin-bottom: .2em;
+  }
+  .commands.calculate td:first-child,
+  .commands.modes td:first-child {
+    width: auto;
+  }
+  .commands tr, .lists tr {
+    display: block;
+    padding: .4em .5em .2em 1.5em;
+  }
+  .operations {
+    table-layout: auto;
+  }
+  .operations td {
+    padding: .5em;
+  }
+  .operations.replacements td:first-child {
+    width: auto;
+  }
+}
+
 @media (min-width: 55em) {
   .intro {
@@ -206,9 +259,7 @@
   p.number {
     position: relative;
-    padding-top: 2em;
+    z-index: -1;
     font-size: 4em;
-  }
-  td {
-    padding: .5em 1em;
+    padding-top: 2em;
   }
   .lists {
@@ -537,16 +588,13 @@
   jump anyway.</p>
 
-<div class="lists third">
-  <table>
-    <tr><td><kbd>C-u&nbsp;3&nbsp;C-p</kbd></td><td>Back 3 lines</td></tr>
-    <tr><td><kbd>C-u&nbsp;10&nbsp;C-f</kbd></td><td>Forward 10 characters</td></tr>
-    <tr><td><kbd>M-1&nbsp;M-0&nbsp;C-f</kbd></td><td>Forward 10 characters</td></tr>
-  </table>
-  <table>
-    <tr><td><kbd>C-u&nbsp;C-n</kbd></td><td>Forward 4 lines</td></tr>
-    <tr><td><kbd>C-u&nbsp;C-u&nbsp;C-n</kbd></td><td>Forward 16 lines</td></tr>
-    <tr><td><kbd>C-u&nbsp;C-u&nbsp;C-u&nbsp;C-n</kbd></td><td>Forward 64 lines</td></tr>
-  </table>
-</div>
+<table class="commands">
+  <tr><td><kbd>C-u&nbsp;3&nbsp;C-p</kbd></td><td>Back 3 lines</td></tr>
+  <tr><td><kbd>C-u&nbsp;10&nbsp;C-f</kbd></td><td>Forward 10 characters</td></tr>
+  <tr><td><kbd>M-1&nbsp;M-0&nbsp;C-f</kbd></td><td>Forward 10 characters</td></tr>
+  <tr><td><kbd>C-u&nbsp;C-n</kbd></td><td>Forward 4 lines</td></tr>
+  <tr><td><kbd>C-u&nbsp;C-u&nbsp;C-n</kbd></td><td>Forward 16 lines</td></tr>
+  <tr><td><kbd>C-u&nbsp;C-u&nbsp;C-u&nbsp;C-n</kbd></td><td>Forward 64 lines</td></tr>
+</table>
+
 <p>You can jump directly to a particular line number in a buffer:</p>
 
@@ -655,8 +703,12 @@
   argument for <kbd>C-k</kbd> can be used to kill multiple lines:</p>
 
-<table class="commands">
-  <tr><td><kbd>C-k</kbd></td><td>Kill line</td></tr>
-  <tr><td><kbd>C-u&nbsp;10&nbsp;C-k</kbd></td><td>Kill 10 lines</td></tr>
-</table>
+<div class="lists">
+  <table>
+    <tr><td><kbd>C-k</kbd></td><td>Kill line</td></tr>
+  </table>
+  <table>
+    <tr><td><kbd>C-u&nbsp;10&nbsp;C-k</kbd></td><td>Kill 10 lines</td></tr>
+  </table>
+</div>
 
 <p>The following commands operate on the region, and are the closest analogs to
@@ -692,5 +744,5 @@
   through previously killed items.</p>
 
-<table class="commands">
+<table class="commands yank">
   <tr><td><kbd>C-y</kbd></td><td>Yanks last killed text</td></tr>
   <tr><td><kbd>M-y</kbd></td><td>Replace yanked text with previously killed
@@ -775,5 +827,5 @@
 <p>These commands help you to issue previously issued queries:</p>
 
-<table class="commands search">
+<table class="commands">
   <tr><td><kbd>C-s&nbsp;C-s</kbd></td><td>Search for most recently searched item</td></tr>
   <tr><td><kbd>C-s&nbsp;M-p</kbd></td><td>Previous item in search history</td></tr>
@@ -805,5 +857,5 @@
   the search string. Here are some of the options available at each prompt:</p>
 
-<ul>
+<ul class="replace">
   <li>Type <kbd>y</kbd> to replace the current match.</li>
   <li>Type <kbd>n</kbd> to skip to the next match without replacing.</li>
@@ -915,5 +967,5 @@
 
 <p style="text-align:center">
-  <kbd>M-d&nbsp;C-d&nbsp;M-u,&nbsp;[SPC]&nbsp;C-y&nbsp;C-n&nbsp;C-a</kbd></p>
+  <kbd>M-d&nbsp;C-d&nbsp;M-u, [SPC]&nbsp;C-y&nbsp;C-n&nbsp;C-a</kbd></p>
 
 <p>After we record that key sequence as a macro, we can type <kbd>M-0&nbsp;F4</kbd> to
@@ -969,6 +1021,6 @@
 <p>For example, if I remember that I want to activate <em>narrowing</em>, but
   don't remember how, I can type <kbd>C-h&nbsp;a&nbsp;narrow&nbsp;RET</kbd> which shows a brief
-  list of commands having to do with <em>narrow</em>, one of which is <kbd>M-x</kbd>
-  <kbd>narrow-to-region</kbd>.</p>
+  list of commands having to do with <em>narrow</em>, one of which is <kbd>M-x
+  narrow-to-region</kbd>.</p>
 
 <h2>More useful features</h2>