diff --git a/doc/gmsh.html b/doc/gmsh.html
index 2983efb0f71543866a1e82294e35fa4ceafd3ac7..8a1236992f60bf2897ebcccc82cea9dccf68e475 100644
--- a/doc/gmsh.html
+++ b/doc/gmsh.html
@@ -23,9 +23,8 @@ CAO, OpenGL, GL2PS, Gmesh">
 
 <h1 align="center">Gmsh: a three-dimensional finite element mesh
 generator with built-in pre- and post-processing facilities</h1>
-<p>
 
-<h4 align="center">Christophe Geuzaine and Jean-François Remacle</h4>
+<h4 align="center">Christophe Geuzaine and Jean-François Remacle<br>
 
 <h4 align="center">Version 2.5.0, Oct 15 2010</h4>
 
@@ -39,9 +38,11 @@ generator with built-in pre- and post-processing facilities</h1>
   <a href="#Screenshots">Screenshots</a> |
   <a href="#Links">Links</a>
 </center>
+</p>
 
 <h2><a name="Description"></a>Description</h2>
 
+<p>
 Gmsh is a 3D finite element grid generator with a build-in CAD engine
 and post-processor. Its design goal is to provide a fast, light and
 user-friendly meshing tool with parametric input and advanced
@@ -50,6 +51,7 @@ geometry, mesh, solver and post-processing. The specification of any
 input to these modules is done either interactively using the
 graphical user interface or in ASCII text files using Gmsh's own
 scripting language.
+</p>
 <p>
 See the screencasts for a <a href="/gmsh/screencasts/">quick tour of
 Gmsh's graphical user interface</a>, or the reference manual for a
@@ -57,6 +59,7 @@ more thorough <a href="/gmsh/doc/texinfo/gmsh.html#Overview">overview
 of Gmsh's capabilities</a> and some
 <a href="/gmsh/doc/texinfo/gmsh.html#Frequently-asked-questions">frequently
 asked questions</a>.
+</p>
 
 <h2><a name="Download"></a>Download</h2>
 
@@ -65,7 +68,7 @@ the <a href="/gmsh/doc/LICENSE.txt">GNU General Public License
 (GPL)</a>:
 <ul>
   <li>
-    <span style="border: 1px dotted; padding: 3px;">
+    <p class="highlight">
       <strong>Current stable release</strong>:
       <a href="/gmsh/bin/Windows/gmsh-2.5.0-Windows.zip"><strong>Windows</strong></a>
       (XP/Vista),
@@ -74,15 +77,13 @@ the <a href="/gmsh/doc/LICENSE.txt">GNU General Public License
       <a href="/gmsh/bin/MacOSX/gmsh-2.5.0-MacOSX.dmg"><strong>Mac OS X</strong></a> 
       (Intel 10.5) and
       <a href="/gmsh/src/gmsh-2.5.0-source.tgz"><strong>source code</strong></a>
-    </span>
+    </p>
     <p>
-
-<em>A <a href="/gmsh/doc/texinfo/gmsh.html#Tutorial"><strong>tutorial</strong></a>
-introducing all key features and concepts is included in all the
-versions in the <code>tutorial</code> directory. <br>Make sure to read
-these examples before sending questions or bug reports!</em>
-<p>
-
+      <em>A <a href="/gmsh/doc/texinfo/gmsh.html#Tutorial"><strong>tutorial</strong></a>
+        introducing all key features and concepts is included in all the
+        versions in the <code>tutorial</code> directory. <br>Make sure to read
+        these examples before sending questions or bug reports!</em>
+    </p>
   <li>Development version:
     <ul><li>automated nightly builds:
         <a href="/gmsh/bin/Windows/gmsh-nightly-Windows.zip">Windows</a>
@@ -110,16 +111,19 @@ Engineering, Volume 79, Issue 11, pages 1309-1331, 2009</a>''.
 
 <h2><a name="Authors"></a>Authors and credits</h2>
 
+<p>
 Gmsh is developed by <a href="http://www.montefiore.ulg.ac.be/~geuzaine">Christophe
 Geuzaine</a> and <a href="http://perso.uclouvain.be/jean-francois.remacle">Jean-François
 Remacle</a>. The <a href="/gmsh/doc/CREDITS.txt">CREDITS</a> file has
 more information.
+</p>
 <p>
 Please use the public mailing list <a HREF="mailto:gmsh@geuz.org">gmsh@geuz.org</a>
 to send questions or ask for help. If you think you have found a bug in the
 program, you can file a report directly
 <a href="https://geuz.org/trac/gmsh/newticket">here</a> (username:
 gmsh, password: gmsh).
+</p>
 
 <h2><a name="Documentation"></a>Documentation</h2>
 
@@ -149,7 +153,6 @@ gmsh, password: gmsh).
 </ul>
 
 <p>
-
 <form method="get" action="http://www.geuz.org/search/search-geuz.cgi">
 <input size="30" name="q" value="">&nbsp;
 <input type="submit" value="Search!">&nbsp;
@@ -160,14 +163,17 @@ gmsh, password: gmsh).
   <option value="/pipermail/gmsh">Gmsh mailing list archives
 </select>
 </form>
+</p>
 
 <h2><a name="Licensing"></a>Licensing</h2>
 
+<p>
 Gmsh is copyright (C) 1997-2011 by C. Geuzaine and J.-F. Remacle and
 is distributed under the terms of
 the <a href="/gmsh/doc/LICENSE.txt">GNU General Public License
 (GPL)</a> (Version 2 or later, with an exception to allow for easier
 linking with external libraries).
+</p>
 <p>
 In short, this means that everyone is free to use Gmsh and to
 redistribute it on a free basis. Gmsh is not in the public domain; it
@@ -181,6 +187,7 @@ parts of Gmsh into a closed-source software, or want to sell a
 modified closed-source version of Gmsh, you will need to obtain a
 different license. Please <a href="/">contact us directly</a> for more
 information.
+</p>
 
 <h2><a name="Screenshots"></a>Screenshots</h2>
 
@@ -271,9 +278,11 @@ thumbnail"></a>
 <input type="image" src="/images/donation.gif" name="submit" 
        alt="Make a donation with PayPal">
 </form>
+</p>
 
 <p>
 Back to <a href="/">geuz.org</a>
+</p>
 
 </body>
 </html>