diff --git a/archiva-docs/src/maven-site.vm b/archiva-docs/src/maven-site.vm
index 68afefd1e..7ab893f4e 100644
--- a/archiva-docs/src/maven-site.vm
+++ b/archiva-docs/src/maven-site.vm
@@ -460,16 +460,16 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
     <title>$title</title>
-    <link rel="stylesheet" href="$relativePath/css/bootstrap-1.3.0.min.css">
-    <link rel="stylesheet" href="$relativePath/css/maven-base.css">
-    <link rel="stylesheet" href="$relativePath/css/boostrap-override.css"
+    <link rel="stylesheet" href="$relativePath/css/bootstrap-1.3.0.min.css"/>
+    <link rel="stylesheet" href="$relativePath/css/maven-base.css"/>
     <link rel="stylesheet" href="$relativePath/css/prettify.css" type="text/css" media="all" />
-    <script src="$relativePath/js/jquery-1.4.3.min.js" type="text/javascript"></script>
-    <script src="$relativePath/js/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>
-    <script src="$relativePath/js/jquery.easing-1.3.pack.js" type="text/javascript"></script>
-    <script src="$relativePath/js/jquery.mousewheel-3.0.4.pack.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="$relativePath/css/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-    <script type="text/javascript">
+      <script src="$relativePath/js/jquery-1.4.3.min.js" type="text/javascript"></script>
+      <script src="$relativePath/js/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>
+      <script src="$relativePath/js/jquery.easing-1.3.pack.js" type="text/javascript"></script>
+      <script src="$relativePath/js/jquery.mousewheel-3.0.4.pack.js" type="text/javascript"></script>
+      <link rel="stylesheet" href="$relativePath/css/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+      <link rel="stylesheet" href="$relativePath/css/boostrap-override.css"/>
+      <script type="text/javascript">
     $(document).ready(function() {
       $("a#single_image").fancybox({
         'transitionIn'	:	'elastic',
@@ -483,7 +483,8 @@
           'transitionOut'	:	'elastic',
           'speedIn'		:	600,
           'speedOut'		:	200,
-          'overlayShow'	:	true
+          'overlayShow'	:	true,
+          'titlePosition': 'inside'
         });
     });
     </script>
diff --git a/archiva-docs/src/site/resources/css/boostrap-override.css b/archiva-docs/src/site/resources/css/boostrap-override.css
index dc0cfafdc..7649e5e84 100644
--- a/archiva-docs/src/site/resources/css/boostrap-override.css
+++ b/archiva-docs/src/site/resources/css/boostrap-override.css
@@ -44,4 +44,6 @@
     -webkit-box-shadow:0 0px 0px rgba(0, 0, 0, 0.075);
     -moz-box-shadow:0 0px 0px rgba(0, 0, 0, 0.075);
     box-shadow:0 0px 0px rgba(0, 0, 0, 0.075);
-}
\ No newline at end of file
+}
+
+#tip7-title b { display: block; margin-right: 80px; }
\ No newline at end of file
diff --git a/archiva-docs/src/site/xdoc/tour/index.xml b/archiva-docs/src/site/xdoc/tour/index.xml
index 5e6414785..e1067c83d 100644
--- a/archiva-docs/src/site/xdoc/tour/index.xml
+++ b/archiva-docs/src/site/xdoc/tour/index.xml
@@ -52,25 +52,34 @@ table.bodyTable tr.b {
       <table>
         <tr>
           <td>
-            <a href="../images/tour/project.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/project.png" class="gallery_image" rel="gallery_image" title="Archiva provides an informative display for artifacts stored in the repository.
+                      This includes a user-friendly display of the Maven informations, as well as the relationships between projects.">
               <img src="../images/tour/project.png" width="150" height="93" style="border: 1px solid silver; margin-bottom: 0.25em" alt="" /><br/>
               1. Project Information
             </a>
           </td>
           <td>
-            <a href="../images/tour/search.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/search.png" class="gallery_image" rel="gallery_image"
+                title="Archiva has both a user-friendly browsing interface, and powerful search functionalities. The contents of all artifacts are indexed,
+                          including Maven project information and Java class information to facilitate locating code within any repository.
+                          By using the Find Artifact feature, you can identify unknown artifacts based on the database of known checksums for known artifacts.">
               <img src="../images/tour/search.png" width="150" height="93" style="border: 1px solid silver; margin-bottom: 0.25em" alt="" /><br/>
               2. Artifact Search
             </a>
           </td>
           <td>
-            <a href="../images/tour/proxy.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/proxy.png" class="gallery_image" rel="gallery_image"
+                title="Archiva can operate as a proxy for remote repositories, allowing you to improve build
+                          performance by caching artifacts in a closer network location, and control artifact
+                          usage through the use of white and black lists on proxy connectors.">
               <img src="../images/tour/proxy.png" width="150" height="93" style="border: 1px solid silver; margin-bottom: 0.25em" alt="" /><br/>
                3. Remote Proxying Cache
             </a>
           </td>
           <td>
-            <a href="../images/tour/upload.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/upload.png" class="gallery_image" rel="gallery_image"
+                title="Archiva now supports artifact uploads via UI. A pom file can also be included
+                          in the upload or Archiva can generate one during the upload.">
               <img src="../images/tour/upload.png" width="150" height="93" style="border: 1px solid silver; margin-bottom: 0.25em" alt="" /><br/>
                4. Artifact Upload
             </a>
@@ -78,25 +87,36 @@ table.bodyTable tr.b {
         </tr>
         <tr>
           <td>
-            <a href="../images/tour/admin.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/admin.png" class="gallery_image" rel="gallery_image"
+                title="Archiva has a comprehensive web-based administration interface for configuring repositories,
+                          remote proxies, scheduled jobs and more. The configuration is kept in sync with the XML
+                          configuration files so that they can also be hand-edited if necessary.">
               <img src="../images/tour/admin.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               5. Graphical Administration
             </a>
           </td>
           <td>
-            <a href="../images/tour/virtual-repos.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/virtual-repos.png" class="gallery_image" rel="gallery_image"
+                title="Archiva implements the concept of virtual repositories, wherein a set of
+                          Archiva repositories can be grouped together under one URL and that one URL
+                          can be used by clients (s.a. Maven) to download from these repositories.">
               <img src="../images/tour/virtual-repos.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               6. Virtual Repositories
             </a>
           </td>
           <td>
-            <a href="../images/tour/rss.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/rss.png" class="gallery_image" rel="gallery_image"
+                title="Archiva provides RSS feeds for new artifacts in the repositories and new versions
+                          of a specific artifact.">
               <img src="../images/tour/rss.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               7. RSS Feeds
             </a>
           </td>
           <td>
-            <a href="../images/tour/security.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/security.png" class="gallery_image" rel="gallery_image"
+                title="Archiva uses the Redback security framework to provide flexible role-based security controls for repositories.
+                          You can use the graphical interface to maintain user accounts, as well as secure repositories for read and/or write
+                          access for individuals, or given roles.">
               <img src="../images/tour/security.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               8. Role-based Security
             </a>
@@ -104,19 +124,30 @@ table.bodyTable tr.b {
         </tr>
         <tr>             
           <td>
-            <a href="../images/tour/reports.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/reports.png" class="gallery_image" rel="gallery_image"
+                title="Archiva monitors the state of the managed repositories and keeps track of
+                          potential problems to allow improvement of metadata and to assist in
+                          troubleshooting problems.">
               <img src="../images/tour/reports.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               9. Integrity Reports
             </a>
           </td>
           <td>
-            <a href="../images/tour/audit-log.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/audit-log.png" class="gallery_image" rel="gallery_image"
+                title="Archiva provides a user interface for querying audit logs. The current
+                          implementation only covers upload/deploy actions but will include other
+                          actions such as artifact delete, repository configuration and more in the future.">
               <img src="../images/tour/audit-log.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               10. Audit Log Report
             </a>
           </td>
           <td>
-            <a href="../images/tour/maintenance.png" class="gallery_image" rel="gallery_image">
+            <a href="../images/tour/maintenance.png" class="gallery_image" rel="gallery_image"
+                title="Archiva has utilities called consumers that can be used for maintaining the
+                          Archiva repositories. These can be configured or activated in the Repository
+                          Scanning section of the webapp. The configuration are stored in Archiva's
+                          xml configuration files, meaning you can also hand-edit these config files to
+                          enable or disable these consumers.">
               <img src="../images/tour/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
               11. Maintenance
             </a>

- + 1. Project Information	- + 2. Artifact Search	- + 3. Remote Proxying Cache	- + 4. Artifact Upload @@ -78,25 +87,36 @@ table.bodyTable tr.b {
- + 5. Graphical Administration	- + 6. Virtual Repositories	- + 7. RSS Feeds	- + 8. Role-based Security @@ -104,19 +124,30 @@ table.bodyTable tr.b {
- + 9. Integrity Reports	- + 10. Audit Log Report	- + 11. Maintenance