diff --git a/Doxyfile b/Doxyfile
index c627803c306f35280c1f235b92ce02d350757395..a19d334242d968ebd14f23748f2d5d24091c7fd8 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-PROJECT_NAME           = "SENF Framework Overview"
+PROJECT_NAME           = Overview
 PROJECT_NUMBER         = "Version 0.0.1"
 
 OUTPUT_DIRECTORY       = doc
diff --git a/Mainpage.dox b/Mainpage.dox
index d37ba40d6d218b45b3cd51b3819264252caec621..e4e38b862a09cbc22ae3cb986da108ca3f28ee34 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -1,6 +1,5 @@
 /** \mainpage SENF: The Simple and Extensible Network Framework
     
-    
 */
 
 
diff --git a/Packets/Doxyfile b/Packets/Doxyfile
index b190777c7ddbd77374b2fc1a3061791adbd0f303..7e3faa35d9f24accd955041fdb6c1825cb7d8ca2 100644
--- a/Packets/Doxyfile
+++ b/Packets/Doxyfile
@@ -1,4 +1,5 @@
-PROJECT_NAME           = "libPackets: The Packets library"
+PROJECT_NAME           = libPackets
 PROJECT_NUMBER         = "Version 0.0.1"
+TAGFILES               = ../Utils/doc/doxytags
 
 @INCLUDE = ../doclib/Doxyfile.global
\ No newline at end of file
diff --git a/Scheduler/Doxyfile b/Scheduler/Doxyfile
index 6fa55a36397b2525e7153a8ff0820e37569a75b6..8ddfbd946fbda78157e2dbaa4d1805b96028bb8c 100644
--- a/Scheduler/Doxyfile
+++ b/Scheduler/Doxyfile
@@ -1,4 +1,5 @@
-PROJECT_NAME           = "libScheduler: The Scheduler library"
+PROJECT_NAME           = libScheduler
 PROJECT_NUMBER         = "Version 0.0.1"
+TAGFILES               = ../Utils/doc/doxytags
 
 @INCLUDE = ../doclib/Doxyfile.global
diff --git a/Socket/Doxyfile b/Socket/Doxyfile
index 76c0c3c73223e8c86248a6677bac12c2b74cac19..1d1ccbbc80a99a0897fccf7772bad2dbee0c2d48 100644
--- a/Socket/Doxyfile
+++ b/Socket/Doxyfile
@@ -1,4 +1,5 @@
-PROJECT_NAME           = "libSocket: The Socket library"
+PROJECT_NAME           = libSocket
 PROJECT_NUMBER         = "Version 0.0.1"
+TAGFILES               = ../Utils/doc/doxytags
 
 @INCLUDE = ../doclib/Doxyfile.global
\ No newline at end of file
diff --git a/Utils/Doxyfile b/Utils/Doxyfile
index df1a435cd7db9f7190122d5479551fddcc8a301d..d57aedbf9f7fabd57aeebd62777bc0bd5f2ec838 100644
--- a/Utils/Doxyfile
+++ b/Utils/Doxyfile
@@ -1,4 +1,4 @@
-PROJECT_NAME           = "libUtils: The Utils library"
+PROJECT_NAME           = libUtils
 PROJECT_NUMBER         = "Version 0.0.1"
 
 @INCLUDE = ../doclib/Doxyfile.global
diff --git a/doclib/Doxyfile.global b/doclib/Doxyfile.global
index 345c0aea185ee5ef60270dbb4785f69d3041f329..eb8488ac3ce86fa3da9d785fdecf9768187bc88e 100644
--- a/doclib/Doxyfile.global
+++ b/doclib/Doxyfile.global
@@ -1,5 +1,3 @@
-# Doxyfile 1.4.2
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
@@ -106,7 +104,7 @@ VERBATIM_HEADERS       = YES
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 5
+COLS_IN_ALPHA_INDEX    = 3
 IGNORE_PREFIX          = 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
@@ -193,8 +191,7 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       = doc/doxytags
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
diff --git a/doclib/doxy-header-overview.html b/doclib/doxy-header-overview.html
index a6ef13802e6df14895f799a1e96dd3a8acaa49ee..71782a31ec018c046dce1e8e4b0a68e42194d2a7 100644
--- a/doclib/doxy-header-overview.html
+++ b/doclib/doxy-header-overview.html
@@ -4,19 +4,22 @@
 <title>$title</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="../../doclib/senf.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+li.$projectname a { background-color: #EDE497; }
+</style>
 </head>
 <body>
 
 <div id="head">
   <h1>SENF Extensible Network Framework</h1>
-  <h2>$projectname</h2>
+  <h2>SENF Framework API reference</h2>
   <ul>
-    <li><b>Libraries</b></li>
-    <li><a href="../../doc/html/index.html"><i>Overview</i></a></li>
-    <li><a href="../../Packets/doc/html/index.html">Packets</a></li>
-    <li><a href="../../Scheduler/doc/html/index.html">Scheduler</a></li>
-    <li><a href="../../Socket/doc/html/index.html">Socket</a></li>
-    <li><a href="../../Utils/doc/html/index.html">Utils</a></li>
+    <li class="Overview"><a href="../../doc/html/index.html"><i>Overview</i></a></li>
+    <li><a href="http://senf.berlios.de"><i>SENF @ BerliOS</i></a></li>
+    <li class="libPackets"><a href="../../Packets/doc/html/index.html">libPackets</a></li>
+    <li class="libScheduler"><a href="../../Scheduler/doc/html/index.html">libScheduler</a></li>
+    <li class="libSocket"><a href="../../Socket/doc/html/index.html">libSocket</a></li>
+    <li class="libUtils"><a href="../../Utils/doc/html/index.html">libUtils</a></li>
   </ul>
 </div>
 
diff --git a/doclib/doxy-header.html b/doclib/doxy-header.html
index 36c32ede4b9cc996277e5240f6271c62a96ad858..c153f0841d3003771e517a8eb1ac665994347320 100644
--- a/doclib/doxy-header.html
+++ b/doclib/doxy-header.html
@@ -4,19 +4,22 @@
 <title>$title</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="../../../doclib/senf.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+li.$projectname a { background-color: #EDE497; }
+</style>
 </head>
 <body>
 
 <div id="head">
   <h1>SENF Extensible Network Framework</h1>
-  <h2>$projectname</h2>
+  <h2>SENF Framework API reference</h2>
   <ul>
-    <li><b>Libraries</b></li>
-    <li><a href="../../../doc/html/index.html"><i>Overview</i></a></li>
-    <li><a href="../../../Packets/doc/html/index.html">Packets</a></li>
-    <li><a href="../../../Scheduler/doc/html/index.html">Scheduler</a></li>
-    <li><a href="../../../Socket/doc/html/index.html">Socket</a></li>
-    <li><a href="../../../Utils/doc/html/index.html">Utils</a></li>
+    <li class="Overview"><a href="../../../doc/html/index.html"><i>Overview</i></a></li>
+    <li><a href="http://senf.berlios.de"><i>SENF @ BerliOS</i></a></li>
+    <li class="libPackets"><a href="../../../Packets/doc/html/index.html">libPackets</a></li>
+    <li class="libScheduler"><a href="../../../Scheduler/doc/html/index.html">libScheduler</a></li>
+    <li class="libSocket"><a href="../../../Socket/doc/html/index.html">libSocket</a></li>
+    <li class="libUtils"><a href="../../../Utils/doc/html/index.html">libUtils</a></li>
   </ul>
 </div>
 
diff --git a/doclib/senf.css b/doclib/senf.css
index d3010425fddaf13ce9af291ecd6421781c85ee80..04a62594c48f00ee140ac97ca950c3fd7d97b578 100644
--- a/doclib/senf.css
+++ b/doclib/senf.css
@@ -37,24 +37,21 @@ body {
 }
 
 #head ul { 
-	position: absolute;
-	top: 5px;
-	right: 25px;
-	width: 100px;
+	float: left;
+	margin: 10px 0 0 10px;
+	width: 120px;
 	background-color: #FDF7C3;
 	border: 1px solid #AF9D00;
 	list-style-type: none;
 	padding: 0;
-	margin: 0;
 }
 
-#head li { 
+#head ul li { 
 	display: inline;
 }
 
 #head ul li a, #head ul li b { 
 	padding: 2px 5px;
-	text-align: center;
 	display: block;
 }
 
@@ -74,16 +71,24 @@ body {
 	text-decoration: none;
 }
 
+#content { 
+	/* Non-0 top padding to fix margin inhertance from first non-float elt */
+	padding: 1px 10px 10px 142px;
+}
+
 div.tabs { 
-	margin: 0 -10px;
+	float: left;
+	clear: left;
+	background-color: #FDF7C3;
+	border: 1px solid #AF9D00;
+	margin: 10px 0 0 -132px;
+	width: 120px; 
+	overflow: hidden;
 }
 
 div.tabs ul { 
 	margin: 0;
 	padding: 0;
-	height: 22px;
-	background-color: #FDF7C3;
-	border-bottom: 1px solid #AF9D00;
 	list-style-type: none;
 }
 
@@ -92,14 +97,13 @@ div.tabs ul li {
 }
 
 div.tabs ul li a { 
-	float: left;
-	height: 18px;
-	padding: 4px 10px 0 10px;
-	border-right: 1px solid #AF9D00;
+	display: block;
+	padding: 2px 5px;
         font-size: 13px;
 	font-weight: normal;
 	color: #726921;
 	text-decoration: none;
+	white-space: nowrap;
 }
 
 div.tabs a:visited, div.tabs a:active { 
@@ -121,6 +125,3 @@ div.nav {
 	margin: 0;	
 }
 
-#content { 
-	padding: 0 10px 10px 10px;
-}
\ No newline at end of file