diff --git a/doc/bounded_array.htm b/doc/bounded_array.htm
index 1d54bed4..779b1b80 100644
--- a/doc/bounded_array.htm
+++ b/doc/bounded_array.htm
@@ -98,16 +98,16 @@ member inside this model of the concept.</li>
 </tr>
 <tr>
 <td><code><em>explicit</em> bounded_array (size_type size, const T&amp; = init)</code></td>
-<td><a href="storage.htm">Storage</a>
+<td><a href="storage_concept.htm">Storage</a>
 <td>Creates an initialized <code>bounded_array</code> that holds at most <code>size</code> elements. All the elements are constructed from the <code>init</code> value.</td> </tr>
 <tr>
 <td><code>bounded_array (size_type size)</code></td>
-<td><a href="storage.htm">Storage</a>
+<td><a href="storage_concept.htm">Storage</a>
 <td>Creates an uninitialized <code>bounded_array</code> that holds at most <code>size</code> elements. All the elements are default constructed.</td>
 </tr>
 <tr>
 <td><code>bounded_array (size_type size, const T& init)</code></td>
-<td><a href="storage.htm">Storage</a>
+<td><a href="storage_concept.htm">Storage</a>
 <td>Creates an <code>bounded_array</code> that holds at most <code>size</code> elements. All the elements are copy-constructed from init.</td>
 </tr>
 <tr>
@@ -122,12 +122,12 @@ member inside this model of the concept.</li>
 </tr>
 <tr>
 <td><code>void resize (size_type size)</code></td>
-<td><a href="storage.htm">Storage</a>
+<td><a href="storage_concept.htm">Storage</a>
 <td>Reallocates a <code>bounded_array</code> to hold at most <code>size</code> elements.</td>
 </tr>
 <tr>
 <td><code>void resize (size_type size, const T& t)</code></td>
-<td><a href="storage.htm">Storage</a>
+<td><a href="storage_concept.htm">Storage</a>
 <td>Reallocates a <code>bounded_array</code> to hold at most <code>size</code> elements.</td>
 </tr>
 <tr>
diff --git a/doc/index.htm b/doc/index.htm
index dbfe9b9d..d3428e05 100644
--- a/doc/index.htm
+++ b/doc/index.htm
@@ -39,43 +39,13 @@ interface.</p>
 <ul>
 <li><big><a href="overview.htm">Overview</a></big>
 <ul>
+<li><a href="overview.htm#rationale">Rationale</a>
+<li><a href="overview.htm#functionality">Functionality</a>
 <li><a href="types_overview.htm">Overview of Matrix- and Vector-Types</a></li>
 <li><a href="operations_overview.htm">Overview of Matrix and Vector Operations</a></li>
 <li><a href="#further_information">Effective uBLAS and further information</a></li>
 </ul>
 </li>
-<li>uBLAS Concept definitions
-<ul>
-<li><a href="container_concept.htm">Container Concepts</a>
-<ul>
-<li><a href="container_concept.htm#vector">Vector</a></li>
-<li><a href="container_concept.htm#matrix">Matrix</a></li>
-</ul>
-<li><a href="expression_concept.htm">Expression Concepts</a>
-<ul>
-<li><a href="expression_concept.htm#scalar_expression">Scalar
-Expression</a></li>
-<li><a href="expression_concept.htm#vector_expression">Vector
-Expression</a></li>
-<li><a href="expression_concept.htm#matrix_expression">Matrix
-Expression</a></li>
-</ul>
-<li><a href="storage_concept.htm">Storage Concept</a>
-<li><a href="iterator_concept.htm">Iterator Concepts</a>
-<ul>
-<li><a href="iterator_concept.htm#indexed_bidirectional_iterator">Indexed
-Bidirectional Iterator</a></li>
-<li><a href="iterator_concept.htm#indexed_random_access_iterator">Indexed
-Random Access Iterator</a></li>
-<li><a href=
-"iterator_concept.htm#indexed_bidirectional_cr_iterator">Indexed
-Bidirectional Column/Row Iterator</a></li>
-<li><a href=
-"iterator_concept.htm#indexed_random_access_cr_iterator">Indexed Random
-Access Column/Row Iterator</a></li>
-</ul>
-</li>
-</ul>
 <li><a href="vector.htm">Vector</a>
 <ul>
 <li><a href="vector.htm#vector">Vector</a></li>
@@ -184,7 +154,7 @@ Vector Operations</a></li>
 Matrix Operations</a></li>
 </ul>
 </li>
-<li>Storage
+<li>Storage and special containers
 <ul>
 <li><a href="unbounded_array.htm">Unbounded Array</a></li>
 <li><a href="bounded_array.htm">Bounded Array</a></li>
@@ -204,6 +174,38 @@ Map</a></li>
 <li><a href="products.htm">Special Products</a></li>
 <li><a href="blas.htm">BLAS</a></li>
 </ul>
+<li>uBLAS Concept definitions
+<ul>
+<li><a href="container_concept.htm">Container Concepts</a>
+<ul>
+<li><a href="container_concept.htm#vector">Vector</a></li>
+<li><a href="container_concept.htm#matrix">Matrix</a></li>
+</ul>
+<li><a href="expression_concept.htm">Expression Concepts</a>
+<ul>
+<li><a href="expression_concept.htm#scalar_expression">Scalar
+Expression</a></li>
+<li><a href="expression_concept.htm#vector_expression">Vector
+Expression</a></li>
+<li><a href="expression_concept.htm#matrix_expression">Matrix
+Expression</a></li>
+</ul>
+<li><a href="storage_concept.htm">Storage Concept</a>
+<li><a href="iterator_concept.htm">Iterator Concepts</a>
+<ul>
+<li><a href="iterator_concept.htm#indexed_bidirectional_iterator">Indexed
+Bidirectional Iterator</a></li>
+<li><a href="iterator_concept.htm#indexed_random_access_iterator">Indexed
+Random Access Iterator</a></li>
+<li><a href=
+"iterator_concept.htm#indexed_bidirectional_cr_iterator">Indexed
+Bidirectional Column/Row Iterator</a></li>
+<li><a href=
+"iterator_concept.htm#indexed_random_access_cr_iterator">Indexed Random
+Access Column/Row Iterator</a></li>
+</ul>
+</li>
+</ul>
 </li>
 </ul>
 <h2>Supported Platforms</h2>
diff --git a/doc/overview.htm b/doc/overview.htm
index d387abb5..e87b751c 100644
--- a/doc/overview.htm
+++ b/doc/overview.htm
@@ -12,7 +12,7 @@
 <body>
 <h1><img src="../../../../boost.png" align="middle" />
 uBLAS Overview</h1>
-<h2>Rationale</h2>
+<h2><a name="rationale" id="rationale">Rationale</h2>
 <p><cite>It would be nice if every kind of numeric software could
 be written in C++ without loss of efficiency, but unless something
 can be found that achieves this without compromising the C++ type
@@ -264,7 +264,7 @@ development cycle. Switching from debug mode to release mode is
 controlled by the <code>NDEBUG</code> preprocessor symbol of
 <code>&lt;cassert&gt;</code>.</p>
 
-<h3>Functionality</h3>
+<h2><a name="functionality" id="functionality">Functionality</h2>
 
 <p>Every C++ library supporting linear algebra will be measured
 against the long-standing Fortran package BLAS. We now describe how
diff --git a/doc/unbounded_array.htm b/doc/unbounded_array.htm
index c61873c9..1ca2651e 100644
--- a/doc/unbounded_array.htm
+++ b/doc/unbounded_array.htm
@@ -52,7 +52,7 @@ int main () {
 </tbody>
 </table>
 <h4>Model of</h4>
-<p><a href="Storage.htm">Storage</a></p>
+<p><a href="storage_concept.htm">Storage</a></p>
 <h4>Type requirements</h4>
 <p>None, except for those imposed by the requirements of Random
 Access Container.</p>
@@ -93,17 +93,17 @@ member inside this model of the concept.</li>
 <tr><td><font color="blue"><code>allocator_type</code></code></td><td></td><td>Defined as ALLOC</td></tr>
 <tr>
 <td><code><em>explicit</em> unbounded_array (<em>ALLOC &amp;a = ALLOC()</em>)</code></td>
-<td><a href="Storage.htm">Storage</a></td>
+<td><a href="storage_concept.htm">Storage</a></td>
 <td>Creates an <code>unbounded_array</code> that holds at most zero elements, using a specified allocator.</td> 
 </tr>
 <tr>
 <td><code><em>explicit</em> unbounded_array (size_type size<em>, ALLOC &amp;a = ALLOC()</em>)</code></td>
-<td><a href="Storage.htm">Storage</a></td>
+<td><a href="storage_concept.htm">Storage</a></td>
 <td>Creates a uninitialized <code>unbounded_array</code> that holds at most <code>size</code> elements, using a specified allocator. All the elements are constructed without an initializer. </td>
 </tr>
 <tr>
 <td><code><em>explicit </em>unbounded_array (size_type size, const T&amp; init<em>, ALLOC&amp; a = ALLOC()</em>)</code></td>
-<td><a href="Storage.htm">Storage</a></td>
+<td><a href="storage_concept.htm">Storage</a></td>
 <td>Creates an initialized <code>unbounded_array</code> that holds at most <code>size</code> elements, using a specified allocator. All the elements are constructed from the <code>init</code> value.</td>
 </tr>
 <tr>
@@ -118,12 +118,12 @@ member inside this model of the concept.</li>
 </tr>
 <tr>
 <td><font color="red"><code>void resize (size_type n <em>, bool preserve = true</em>)</code></font></td>
-<td><a href="Storage.htm">Storage</a></td>
+<td><a href="storage_concept.htm">Storage</a></td>
 <td>Reallocates an <code>unbounded_array</code> to hold at most <code>n</code> elements. When <code>preserve == false</code> the elements values after resize are undefined.</td>
 </tr>
 <tr>
 <td><code>void resize(size_type n, const T& t)</code></font></td>
-<td><a href="Storage.htm">Storage</a></td>
+<td><a href="storage_concept.htm">Storage</a></td>
 <td>Reallocates an <code>unbounded_array</code> to hold at most <code>n</code> elements. 
 </tr>
 <tr>