2 files changed, 8 insertions, 6 deletions
diff --git a/src/Haddock/Backends/Xhtml.hs b/src/Haddock/Backends/Xhtml.hs
index e3f28824..8a66a987 100644
--- a/src/Haddock/Backends/Xhtml.hs
+++ b/src/Haddock/Backends/Xhtml.hs
@@ -33,7 +33,6 @@ import Haddock.Types
 import Haddock.Version
 import Haddock.Utils
 import Text.XHtml hiding ( name, title, p, quote )
-import qualified Text.XHtml as Html
 import Haddock.GhcUtils
 
 import Control.Exception     ( bracket )
@@ -392,8 +391,8 @@ ppHtmlContentsFrame odir doctitle ifaces = do
              thetitle (toHtml doctitle) +++
              styleSheet +++
              (script ! [src jsFile, thetype "text/javascript"] $ noHtml)) +++
-        body << vanillaTable << Html.p << (
-            foldr (+++) noHtml (map (+++br) mods))
+        miniBody << divModuleList << 
+          (sectionName << "Modules" +++ shortDeclList mods)
   createDirectoryIfMissing True odir
   writeFile (joinPath [odir, frameIndexHtmlFile]) (renderToString html)
 
diff --git a/src/Haddock/Backends/Xhtml/Layout.hs b/src/Haddock/Backends/Xhtml/Layout.hs
index d7f9c1c8..b6818b61 100644
--- a/src/Haddock/Backends/Xhtml/Layout.hs
+++ b/src/Haddock/Backends/Xhtml/Layout.hs
@@ -14,8 +14,9 @@ module Haddock.Backends.Xhtml.Layout (
   miniBody,
   
   divPackageHeader, divModuleHeader, divFooter,
-  divTableOfContents, divDescription, divSynposis, divInterface, 
-  
+  divModuleList, divTableOfContents,
+  divDescription, divSynposis, divInterface,
+
   sectionName,
   
   shortDeclList,
@@ -56,7 +57,9 @@ divPackageHeader = thediv ! [identifier "package-header"]
 divModuleHeader  = thediv ! [identifier "module-header"]
 divFooter        = thediv ! [identifier "footer"]
 
-divTableOfContents, divDescription, divSynposis, divInterface :: Html -> Html
+divModuleList, divTableOfContents,
+  divDescription, divSynposis, divInterface :: Html -> Html
+divModuleList      = thediv ! [identifier "module-list"]
 divTableOfContents = thediv ! [identifier "table-of-contents"]
 divDescription     = thediv ! [identifier "description"]
 divSynposis        = thediv ! [identifier "synopsis"]