Index: start.html
===================================================================
--- start.html	(revision 5003)
+++ start.html	(working copy)
@@ -29,6 +29,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">
Index: features.html
===================================================================
--- features.html	(revision 5003)
+++ features.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">
Index: screenshots.html
===================================================================
--- screenshots.html	(revision 5003)
+++ screenshots.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">
Index: development.html
===================================================================
--- development.html	(revision 5003)
+++ development.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">
Index: download.html
===================================================================
--- download.html	(revision 5003)
+++ download.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">
Index: faq.html
===================================================================
--- faq.html	(revision 5003)
+++ faq.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 <div id="content">
 
@@ -80,16 +87,14 @@
 <p>Right now there is libtracker. We are working for an high level API. <a href="http://bugzilla.gnome.org/show_bug.cgi?id=405381">High API request</a>.</p>
 
 <h4 id="point7">If I have Nautilus with support for both Tracker and Beagle which one is used?</h4>
-<p>
-At the moment this is how it works:
+<p>At the moment this is how it works:</p>
 	<ul>
 		<li>If you have both Beagle and Tracker running, Beagle is used.</li>
 		<li>If Beagle and Tracker are not running, Tracker is autostarted through a D-BUS call and then it is used to perform the search.</li>
 		<li>If Tracker is running and Beagle is not running, Tracker is used.</li>
 		<li>If Beagle is running and Tracker is not running, Beagle is used.</li>
 	</ul>
-	Further references <a href="http://svn.gnome.org/viewcvs/nautilus/trunk/libnautilus-private/nautilus-search-engine.c?view=markup">http://svn.gnome.org/viewcvs/nautilus/trunk/libnautilus-private/nautilus-search-engine.c?view=markup</a>
-</p>
+<p>Further references <a href="http://svn.gnome.org/viewcvs/nautilus/trunk/libnautilus-private/nautilus-search-engine.c?view=markup">viewcvs: nautilus-search-engine.c</a></p>
 
 <div id="footer">
 
Index: index.html
===================================================================
--- index.html	(revision 5003)
+++ index.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">
@@ -40,30 +47,79 @@
 <p>Metadata, or data about data includes attributes specific to each file, such as the artist of a song or the author of a document. Tracker reads this metadata, and places it into and index, which allows searches to be lightning fast. Tracker updates its index automatically, so search results are always accurate up-to-the-moment.</p>
 <p>Tracker doesn't stop there -- by allowing you to attach your own metadata to files it frees you from having to keep everything in highly organised folders. You can add one or many 'tags' to files, effectively grouping several files in your filesystem even if they are located in different folders. So, tagging can be much easier and more flexible than fitting your information into preconceived categories or folders.</p>
 
-<h4>Supported information sources include:</h4>
-
 <table class="tab_class">
-	<tr><td><img alt="files" src="images/files.png"/></td><td><strong>Files</strong></td></tr>
-	<tr><td><img alt="documents" src="images/docs.png"/></td><td><strong>Documents</strong></td></tr>
-	<tr><td><img alt="music" src="images/music.png"/></td><td><strong>Music</strong></td></tr>
-	<tr><td><img alt="images" src="images/images.png"/></td><td><strong>Images</strong></td></tr>
-	<tr><td><img alt="videos" src="images/videos.png"/></td><td><strong>Videos</strong></td></tr>
-	<tr><td><img alt="text" src="images/text.png"/></td><td><strong>Text Files</strong></td></tr>
-	<tr><td><img alt="developmentfiles" src="images/development.png"/></td><td><strong>Development Files</strong></td></tr>
-</table>
+    <tr>
+        <td colspan="2"><h4>Supported information sources include:</h4></td>
+        <td colspan="2"><h4>Planned support:</h4></td>
+    </tr>
+    
+    <tr>
+        <td><img alt="files" src="images/files.png"/></td>
+        <td><strong>Files</strong></td>
+        <td><img alt="playlist" src="images/playlist.png"/></td>
+        <td><strong>Playlists</strong></td>
+    </tr>
+    
+    <tr>
+        <td><img alt="documents" src="images/docs.png"/></td>
+        <td><strong>Documents</strong></td>
+        <td><img alt="notes" src="images/notes.png"/></td>
+        <td><strong>Notes</strong></td>
+    </tr>
+    
+    <tr>
+        <td><img alt="music" src="images/music.png"/></td>
+        <td><strong>Music</strong></td>
+        <td><img alt="application" src="images/app.png"/></td>
+        <td><strong>Applications</strong></td>        
+    </tr>
+    
+    <tr>
+        <td><img alt="images" src="images/images.png"/></td>
+        <td><strong>Images</strong></td>
+        <td><img alt="contacts" src="images/contacts.png"/></td>
+        <td><strong>People/Contacts</strong></td>
+    </tr>
+    
+    <tr>
+        <td><img alt="videos" src="images/videos.png"/></td>
+        <td><strong>Videos</strong></td>
+        <td><img alt="emails" src="images/email.png"/></td>
+        <td><strong>Emails</strong></td>        
+    </tr>
+    
+    <tr>
+        <td><img alt="text" src="images/text.png"/></td>
+        <td><strong>Text Files</strong></td>
+        <td><img alt="conversation" src="images/conversation.png"/></td>
+        <td><strong>Conversations</strong></td>
+    </tr>
+    
+    <tr>
+        <td><img alt="developmentfiles" src="images/development.png"/></td>
+        <td><strong>Development Files</strong></td>
+        <td><img alt="appointments" src="images/appointments.png"/></td>
+        <td><strong>Appointments</strong></td>
+    </tr>
 
-<h4>Planned support:</h4>
-<table class="tab_class">
-	<tr><td><img alt="playlist" src="images/playlist.png"/></td><td><strong>Playlists</strong></td></tr>
-	<tr><td><img alt="notes" src="images/notes.png"/></td><td><strong>Notes</strong></td></tr>
-	<tr><td><img alt="application" src="images/app.png"/></td><td><strong>Applications</strong></td></tr>
-	<tr><td><img alt="contacts" src="images/contacts.png"/></td><td><strong>People/Contacts</strong></td></tr>
-	<tr><td><img alt="emails" src="images/email.png"/></td><td><strong>Emails</strong></td></tr>
-	<tr><td><img alt="conversation" src="images/conversation.png"/></td><td><strong>Conversations</strong></td></tr>
-	<tr><td><img alt="appointments" src="images/appointments.png"/></td><td><strong>Appointments</strong></td></tr>
-	<tr><td><img alt="tasks" src="images/tasks.png"/></td><td><strong>Tasks</strong></td></tr>
-	<tr><td><img alt="bookmarks" src="images/bookmark.png"/></td><td><strong>Bookmarks and History</strong></td></tr>
-	<tr><td><img alt="project" src="images/projects.png"/></td><td><strong>Projects</strong></td></tr>
+    <tr>
+        <td colspan="2"/>
+        <td><img alt="tasks" src="images/tasks.png"/></td>
+        <td><strong>Tasks</strong></td>
+    </tr>
+
+	<tr>
+        <td colspan="2"/>
+	    <td><img alt="bookmarks" src="images/bookmark.png"/></td>
+	    <td><strong>Bookmarks and History</strong></td>
+	</tr>
+
+	<tr>
+        <td colspan="2"/>
+	    <td><img alt="project" src="images/projects.png"/></td>
+	    <td><strong>Projects</strong></td>
+	</tr>
+    
 </table>
 
 <h3>News</h3>
Index: documentation.html
===================================================================
--- documentation.html	(revision 5003)
+++ documentation.html	(working copy)
@@ -30,6 +30,13 @@
     <p>
         <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
     </p>
+
+    <p>
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">
+            <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" />
+        </a>
+    </p>
+
 </div>
 
 <div id="content">