diff --git a/doc/mkvmerge-gui.html b/doc/mkvmerge-gui.html
index 0fd9fbeca..bd3125e3f 100644
--- a/doc/mkvmerge-gui.html
+++ b/doc/mkvmerge-gui.html
@@ -15,7 +15,7 @@
       <li>
         <a href="mkvmerge-gui.html#introduction">Introduction</a>
         <br>
-        <ul>
+        <ol>
           <li>
             <a href="mkvmerge-gui.html#whatismatroska">What is Matroska?</a>
           </li>
@@ -32,7 +32,7 @@
           <li>
             <a href="mkvmerge-gui.html#scope">Scope of this guide</a>
           </li>
-        </ul>
+        </ol>
       </li>
       <li>
         <a href="mkvmerge-gui.html#setup">Setting up mkvmerge GUI</a>
@@ -40,7 +40,7 @@
       <li>
         <a href="mkvmerge-gui.html#muxing">Creating Matroska files</a>
         <br>
-        <ul>
+        <ol>
           <li>
             <a href="mkvmerge-gui.html#basics">Basics</a>
           </li>
@@ -59,6 +59,27 @@
           </li>
           <li>
             <a href="mkvmerge-gui.html#globaloptions">Global options</a>
+            <br>
+            <ol>
+              <li>
+                <a href="mkvmerge-gui.html#global_title">File/segment
+                  title</a>
+              </li>
+              <li>
+                <a href="mkvmerge-gui.html#global_split">Automatic
+                  splitting and file linking</a>
+              </li>
+              <li>
+                <a href="mkvmerge-gui.html#global_link">Manual
+                  file/segment linking</a>
+              </li>
+              <li>
+                <a href="mkvmerge-gui.html#global_chapters">Chapters</a>
+              </li>
+              <li>
+                <a href="mkvmerge-gui.html#global_tags">Global tags</a>
+              </li>
+            </ol>
           </li>
           <li>
             <a href="mkvmerge-gui.html#doit">Starting the merge
@@ -70,12 +91,12 @@
               muxing settings
             </a>
           </li>
-        </ul>
+        </ol>
       </li>
       <li>
         <a href="mkvmerge-gui.html#chaptereditor">The chapter editor</a>
         <br>
-        <ul>
+        <ol>
           <li>
             <a href="mkvmerge-gui.html#chapterconcept">Matroska's
               chapter concept
@@ -89,7 +110,7 @@
               supported by mkvmerge
             </a>
             <br>
-            <ul>
+            <ol>
               <li>
                 <a href="mkvmerge-gui.html#cfsimple">Simple/OGM style
                   chapter files
@@ -105,7 +126,7 @@
                   Matroska files
                 </a>
               </li>
-            </ul>
+            </ol>
           </li>
           <li>
             <a href="mkvmerge-gui.html#creatingchapters">Creating
@@ -117,16 +138,16 @@
               chapters
             </a>
           </li>
-        </ul>
+        </ol>
       </li>
     </ol>
   </p>
 
   <hr>
 
-  <h2><a name="introduction">Introduction</a></h2>
+  <h2><a name="introduction">1. Introduction</a></h2>
 
-  <h3><a name="whatismatroska">What is Matroska?</a></h3>
+  <h3><a name="whatismatroska">1.1. What is Matroska?</a></h3>
 
   <p>(<i>Note: simply copied from <a href="http://www.matroska.org/">
         www.matroska.org</a>.</i>)</p>
@@ -162,7 +183,7 @@
     other Unix derivatives. The program is licensed under the GPL, so
     the source code is available to anyone interested.</p>
 
-  <h3><a name="latestversion">Obtaining the latest version</a></h3>
+  <h3><a name="latestversion">1.2. Obtaining the latest version</a></h3>
 
   <p>You can always find the latest version of <i>mkvtoolnix</i> on
     <a href="http://www.bunkus.org/videotools/mkvtoolnix/">Moritz
@@ -171,7 +192,7 @@
     will probably download the sources and compile
     <i>mkvtoolnix</i> themselves.</p>
 
-  <h3><a name="scope">Scope of this guide</a></h3>
+  <h3><a name="scope">1.3. Scope of this guide</a></h3>
 
   <p>This guide only focusses on the GUI part of these tools. All
     command line options are explained in detail in <a
@@ -179,7 +200,7 @@
 
   <hr>
 
-  <h2><a name="setup">Setting up mkvmerge GUI</a></h2>
+  <h2><a name="setup">2. Setting up mkvmerge GUI</a></h2>
 
   <p>(<i>Note: This section does not cover compilation and
       installation. <i>mkvmerge</i>'s own documentation and the
@@ -188,14 +209,14 @@
 
   <table width="100%" border="0">
     <tr>
-      <td>
+      <td valign="top">
         <p>The only thing that <i>mmg</i> needs to know is the location of the
           <i>mkvmerge</i> binary. Under normal circumstances it will be
           found automatically. But if not then you can select the binary
           to use on the <i>Settings</i> tab.</p>
       </td>
       <td>&nbsp;</td>
-      <td>
+      <td valign="top">
         <img src="images/selectmkvmergeexecutable.png"
              alt="selecting the mkvmerge executable">
         <br>
@@ -207,9 +228,9 @@
 
   <hr>
 
-  <h2><a name="muxing">Creating Matroska files</a></h2>
+  <h2><a name="muxing">3. Creating Matroska files</a></h2>
 
-  <h3><a name="basics">Basics</a></h3>
+  <h3><a name="basics">3.1. Basics</a></h3>
 
   <p><i>mkvmerge</i> strictly differentiates between <i>files</i> and
     <i>tracks</i>. An input <i>file</i> usually contains one or more
@@ -267,7 +288,7 @@
           sections.</p>
       </td>
       <td>&nbsp;</td>
-      <td>
+      <td valign="top">
         <img src="images/trackselection.png"
              alt="selecting specific tracks">
         <br>
@@ -279,7 +300,7 @@
   </table>
 
 
-  <h3><a name="fileoptions">Options for input file</a></h3>
+  <h3><a name="fileoptions">3.2. Options for input file</a></h3>
 
   <p>Once the user has added and selected an input file he can set
     options that apply to this specific file. At the moment three such
@@ -297,7 +318,7 @@
     the <a href="mkvmerge-gui.html#chaptereditor">chapter editor</a> in
     this document and in <i>mkvmerge</i>'s own documentation.</p>
 
-  <h3><a name="trackoptions">Options for each track</a></h3>
+  <h3><a name="trackoptions">3.3. Options for each track</a></h3>
 
   <p>Depending on the type of the currently selected track (audio,
     video, subtitles) and even depending on the contents of the track
@@ -306,7 +327,7 @@
 
   <table width="100%" border="0">
     <tr>
-      <td>
+      <td valign="top">
         <ul>
 
           <li><code>Language:</code> The user can select the language
@@ -434,11 +455,11 @@
     </tr>
   </table>
 
-  <h3><a name="attachments">Attachments</a></h3>
+  <h3><a name="attachments">3.4. Attachments</a></h3>
 
   <table width="100%" border="0">
     <tr>
-      <td>
+      <td valign="top">
 
         <p>Matroska files can also contain other files, called
           attachments. This works basically just like with your
@@ -490,16 +511,16 @@
     </tr>
   </table>
 
-  <h3><a name="globaloptions">Global options</a></h3>
+  <h3><a name="globaloptions">3.5. Global options</a></h3>
 
   <p>The third tab, <i>Global</i>, is packed full of options that apply
     to the complete file and not just to one or more tracks.</p>
 
   <table width="100%" border="0">
     <tr>
-      <td>
+      <td valign="top">
 
-        <h4><a name="global_title">File/segment title</a></h4>
+        <h4><a name="global_title">3.5.1. File/segment title</a></h4>
 
         <p><code>File/segment title:</code> This title is used for the
           actual movie title, e.g. 'Vanilla Skies'.</p>
@@ -516,8 +537,8 @@
       </td>
     </tr>
     <tr>
-      <td>
-        <h4><a name="global_split">Automatic splitting and file linking
+      <td valign="top">
+        <h4><a name="global_split">3.5.2. Automatic splitting and file linking
         </a></h4>
 
         <p>The <code>Split</code> section handles how the output file is
@@ -570,7 +591,7 @@
           can turn it off by enabling this <code>Don't link</code>
           check box.</p>
 
-        <h4><a name="global_link">Manual file/segment linking</a></h4>
+        <h4><a name="global_link">3.5.3. Manual file/segment linking</a></h4>
 
         <p>Regardless of whether splitting is active or not the user can tell
           <i>mkvmerge</i> to link the produced files to specific
@@ -593,7 +614,7 @@
           the one output file will be linked to both of the two
           UIDs.</p>
 
-        <h4><a name="global_chapters">Chapters</a></h4>
+        <h4><a name="global_chapters">3.5.4. Chapters</a></h4>
 
         <p>With the browse button you can select the chapters to add to
           the output file. A full explanation of all aspects around
@@ -601,7 +622,7 @@
           href="mkvmerge-gui.html#chaptereditor"> Chapter editor
           section</a>.</p>
 
-        <h4><a name="global_tags">Global tags</a></h4>
+        <h4><a name="global_tags">3.5.5. Global tags</a></h4>
 
         <p>Unlike the tags you can select for each track on the input
           tab the tags selected here have to contain the track
@@ -626,7 +647,7 @@
     </tr>
   </table>
 
-  <h3><a name="doit">Starting the merge process</a></h3>
+  <h3><a name="doit">3.6. Starting the merge process</a></h3>
 
   <table width="100%" border="0">
     <tr>
@@ -680,7 +701,7 @@
     </tr>
   </table>
 
-  <h3><a name="saveload">Saving and loading muxing settings</a></h3>
+  <h3><a name="saveload">3.7. Saving and loading muxing settings</a></h3>
 
   <p>All your hard work of setting options does not have to be lost when
     you exit the program. You can save all your muxing settings into
@@ -694,7 +715,7 @@
 
   <hr>
 
-  <h2><a name="chaptereditor">The chapter editor</a></h2>
+  <h2><a name="chaptereditor">4. The chapter editor</a></h2>
 
   <p>One of the new features of <i>mmg</i> is a full-featured chapter
     editor. It can read text based chapter files, import chapters from
@@ -702,7 +723,7 @@
     selected on the global tab and write chapters directly to existing
     Matroska files.</p>
 
-  <h3><a name="chapterconcept">Matroska's chapter concept</a></h3>
+  <h3><a name="chapterconcept">4.1. Matroska's chapter concept</a></h3>
 
   <p>Unlike a lot of other systems Matroska supports <i>nested</i>
     chapters. This basically means that you can define sub chapters for
@@ -717,7 +738,7 @@
     the language code. <i>mkvmerge</i> will then automatically assign
     all chapters to the complete file.</p>
 
-  <h3><a name="chapterexamples">Examples</a></h3>
+  <h3><a name="chapterexamples">4.2. Examples</a></h3>
 
   <p>The first example is a simple one. The movie in question contains
     four parts: The intro starting at the beginning, the first act, the
@@ -789,7 +810,7 @@
   <p><i>mkvmerge</i> and <i>mmg</i>'s chapter editor both support
     different formats for chapter files.</p>
 
-  <h4><a name="cfsimple">Simple/OGM style chapter files</a></h4>
+  <h4><a name="cfsimple">4.2.1. Simple/OGM style chapter files</a></h4>
 
   <p>One of the most basic formats is the format used in OGM files. It
     is a text based format. Each chapter entry contains of two lines,
@@ -817,7 +838,7 @@
   <p>Due to its limitations <i>mmg</i> cannot output chapters in this
     format.</p>
 
-  <h4><a name="cfxml">Full-featured XML style chapter files</a></h4>
+  <h4><a name="cfxml">4.2.2. Full-featured XML style chapter files</a></h4>
 
   <p>I've created a XML based chapter format that closely matches the
     system Matroska uses. With this format you have the full control
@@ -825,14 +846,14 @@
     detail. Please have a look at the example XML chapter files that
     came with <i>mkvtoolnix</i>.</p>
 
-  <h4><a name="cfkax">Chapters found in Matroska files</a></h4>
+  <h4><a name="cfkax">4.2.3. Chapters found in Matroska files</a></h4>
 
   <p>The chapter editor can read chapters directly from Matroska
     files. These can be written to XML chapter files or back to the same
     Matroska file or another Matroska file. All features are
     supported.</p>
 
-  <h3><a name="creatingchapters">Creating chapter files</a></h3>
+  <h3><a name="creatingchapters">4.3. Creating chapter files</a></h3>
 
   <table width="100%" border="0">
     <tr>
@@ -873,7 +894,7 @@
           use <code>Save to Matroska file</code> for that.</p>
       </td>
       <td>&nbsp;</td>
-      <td>
+      <td valign="top">
         <p>
           <img src="images/chaptereditor.png"
                alt="the chapter editor">
@@ -885,7 +906,7 @@
     </tr>
   </table>
 
-  <h3><a name="editingchapters">Editing existing chapters</a></h3>
+  <h3><a name="editingchapters">4.4. Editing existing chapters</a></h3>
 
   <p>You can load existing chapter files or chapters from Matroska files
     by selecting the <code>Load</code> option from the <code>Chapter