diff --git a/docs/index.html b/docs/index.html
index 2c0d9b449..5ed085294 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2916,9 +2916,9 @@
   <ol>
     <li>Enter <b>Options Menu</b> and click the <b>Input Settings</b> button.</li>
     <li>If you wish to remap emulation events, click the 'Emulation Events' tab. Here
-	  you can also filter for the type of events.
+      you can also filter for the type of events.
       Otherwise, click the 'UI Events' tab for user interface events.</li>
-    <li>Select event you want to remap and double-click or click the 'Map' button.</li>
+    <li>Select event you want to remap and click the 'Map' button.</li>
     <li>Now define the input:
     <ul>
       <li>Either press a key, a modifier key (Control, Shift...) or a modifier+key combination.</li>
@@ -2932,17 +2932,21 @@
       <li>Events which are available in both event modes can be remapped individually.</li>
       <li>Left and right modifiers are mapped separately when used alone.</li>
     </ul></li>
-    <li>Cancel a remap in progress by clicking 'Cancel', erase the event's mappings by
-      clicking 'Erase', or reset to default mapping by clicking 'Reset'</li>
-    <li>Reset to default <b>all</b> mappings by clicking 'Defaults'.</li>
   </ol>
+  You can also:
+  <ul>
+    <li>Cancel a remap in progress by clicking 'Cancel'. <br/>Note: Pressing 'ESC' will map that key, <b>not</b> abort the mapping.</li>
+    <li>Erase all event's mappings by clicking 'Erase'.</li>
+    <li>Reset the event to its default mapping by clicking 'Reset'.</li>
+    <li>Reset <b>all</b> emulation or UI event mappings to default by clicking 'Defaults'.</li>
+  </ul>
 
   <p>The following screenshots illustrate the event remapping process:<br><br>
   <img src="graphics/eventmapping.png">
   <img src="graphics/eventmapping_remap.png">
 
-  <p>There is also a 'Combo' button in the 'Emulation Events' tab, accessible
-  when a Combo event has been selected from the list of events on the left.
+  <p>Finally there is a 'Combo' button in the 'Emulation Events' tab, accessible
+  only when a Combo event has been selected from the list of events on the left.
   Clicking 'Combo' will show a dialog similar to the following:</p>
   <img src="graphics/eventmapping_combo.png">
   <p>In this dialog, you can assign various events to the selected combo event.
@@ -2950,9 +2954,9 @@
   to map the combo event itself to some action, as described in the 'remap an
   event' section above.</p>
 
-  </p>
+  </p></br>
 
-  <p>Device and port settings can be configured under the 'Devices & Ports' tab, shown below:</p>
+  <p><b>Device and port</b> settings can be configured under the 'Devices & Ports' tab, shown below:</p>
   <table border="5" cellpadding="2" frame="box" rules="none">
     <tr>
       <td><img src="graphics/eventmapping_devsports.png"></td>
@@ -3712,14 +3716,14 @@ Ms Pac-Man (Stella extended codes):
         <tr><td>F8SC </td><td>8K Atari + RAM </td><td>.F8S, .F8SC </td></tr>
         <tr><td>FA </td><td>CBS RAM Plus </td><td>.FA </td></tr>
         <tr><td>FA2 </td><td>CBS RAM Plus 24/28K </td><td>.FA2 </td></tr>
-		<tr><td>FC </td><td>Amiga Power Play Aracde 16/32K </td><td>.FC </td></tr>
+        <tr><td>FC </td><td>Amiga Power Play Aracde 16/32K </td><td>.FC </td></tr>
         <tr><td>FE </td><td>8K Decathlon </td><td>.FE </td></tr>
         <tr><td>MDM </td><td>Menu Driven Megacart </td><td>.MDM </td></tr>
         <tr><td>SB </td><td>128-256k SUPERbanking </td><td>.SB </td></tr>
         <tr><td>UA </td><td>8K UA Ltd. </td><td>.UA </td></tr>
         <tr><td>UASW </td><td>8K UA Ltd. (swapped banks)</td><td>.UASW </td></tr>
         <tr><td>WD </td><td>Wickstead Design (Pink Panther) </td><td>.WD </td></tr>
-		<tr><td>WDSW </td><td>Wickstead Design (Pink Panther) (bad)</td><td>.WDSW </td></tr>
+        <tr><td>WDSW </td><td>Wickstead Design (Pink Panther) (bad)</td><td>.WDSW </td></tr>
         <tr><td>X07 &#185;</td><td>64K AtariAge </td><td>.X07 </td></tr>
       </table></td>
     </tr>