diff --git a/gnome-help/C/files-browse.page b/gnome-help/C/files-browse.page
index 0fb6dad..7f60189 100644
--- a/gnome-help/C/files-browse.page
+++ b/gnome-help/C/files-browse.page
@@ -4,7 +4,7 @@
       id="files-browse">
 
   <info>
-    <link type="guide" xref="files" group="#first"/>
+    <link type="guide" xref="files#common-file-tasks"/>
     <link type="seealso" xref="files-copy"/>
 
     <revision pkgversion="3.5.92" version="0.2" date="2012-09-16" status="review"/>
diff --git a/gnome-help/C/files-copy.page b/gnome-help/C/files-copy.page
index e8d2239..2590022 100644
--- a/gnome-help/C/files-copy.page
+++ b/gnome-help/C/files-copy.page
@@ -4,7 +4,7 @@
       id="files-copy">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#common-file-tasks"/>
 
     <revision pkgversion="3.5.92" version="0.2" date="2012-09-15" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="review"/>
diff --git a/gnome-help/C/files-delete.page b/gnome-help/C/files-delete.page
index ea59e33..38f5b73 100644
--- a/gnome-help/C/files-delete.page
+++ b/gnome-help/C/files-delete.page
@@ -3,7 +3,7 @@
       id="files-delete">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#common-file-tasks"/>
     <link type="seealso" xref="files-recover"/>
 
     <revision pkgversion="3.5.92" version="0.2" date="2012-09-16" status="review"/>
diff --git a/gnome-help/C/files-disc-write.page b/gnome-help/C/files-disc-write.page
index f19ea3b..c353cd5 100644
--- a/gnome-help/C/files-disc-write.page
+++ b/gnome-help/C/files-disc-write.page
@@ -4,7 +4,7 @@
       id="files-disc-write">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
 
diff --git a/gnome-help/C/files-lost.page b/gnome-help/C/files-lost.page
index 063bffd..857559e 100644
--- a/gnome-help/C/files-lost.page
+++ b/gnome-help/C/files-lost.page
@@ -4,7 +4,7 @@
       id="files-lost">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-09-28" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="candidate"/>
diff --git a/gnome-help/C/files-open.page b/gnome-help/C/files-open.page
index 22696ee..4425acc 100644
--- a/gnome-help/C/files-open.page
+++ b/gnome-help/C/files-open.page
@@ -3,7 +3,7 @@
       id="files-open">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-09-30" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="review"/>
diff --git a/gnome-help/C/files-preview.page b/gnome-help/C/files-preview.page
index 6f2ee2d..1fdfcbd 100644
--- a/gnome-help/C/files-preview.page
+++ b/gnome-help/C/files-preview.page
@@ -4,7 +4,7 @@
       id="files-preview">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#common-file-tasks"/>
     <link type="seealso" xref="nautilus-preview"/>
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-10-06" status="review"/>
diff --git a/gnome-help/C/files-recover.page b/gnome-help/C/files-recover.page
index b0d8bf4..2fde8b4 100644
--- a/gnome-help/C/files-recover.page
+++ b/gnome-help/C/files-recover.page
@@ -4,7 +4,7 @@
       id="files-recover">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
     <link type="seealso" xref="files-lost" />
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-09-28" status="review"/>
diff --git a/gnome-help/C/files-rename.page b/gnome-help/C/files-rename.page
index 5a3dc50..082f8f9 100644
--- a/gnome-help/C/files-rename.page
+++ b/gnome-help/C/files-rename.page
@@ -3,7 +3,7 @@
       id="files-rename">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#common-file-tasks"/>
 
     <revision pkgversion="3.5.92" version="0.2" date="2012-09-19" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="review"/>
diff --git a/gnome-help/C/files-search.page b/gnome-help/C/files-search.page
index b5368f0..f3af9b7 100644
--- a/gnome-help/C/files-search.page
+++ b/gnome-help/C/files-search.page
@@ -3,7 +3,7 @@
       id="files-search">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#common-file-tasks"/>
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-09-25" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-20" status="review"/>
diff --git a/gnome-help/C/files-share.page b/gnome-help/C/files-share.page
index e884a44..1fcd823 100644
--- a/gnome-help/C/files-share.page
+++ b/gnome-help/C/files-share.page
@@ -3,7 +3,7 @@
       id="files-share">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
     <link type="guide" xref="sharing"/>
     <link type="seealso" xref="nautilus-connect"/>
 
diff --git a/gnome-help/C/files-sort.page b/gnome-help/C/files-sort.page
index b2482ef..af73f48 100644
--- a/gnome-help/C/files-sort.page
+++ b/gnome-help/C/files-sort.page
@@ -4,7 +4,7 @@
       id="files-sort">
 
   <info>
-    <link type="guide" xref="files"/>
+    <link type="guide" xref="files#common-file-tasks"/>
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-09-25" status="review"/>
     <revision pkgversion="3.13.92" date="2014-09-22" status="review"/>
diff --git a/gnome-help/C/files.page b/gnome-help/C/files.page
index 096f587..aac9aa6 100644
--- a/gnome-help/C/files.page
+++ b/gnome-help/C/files.page
@@ -10,6 +10,7 @@
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
     <revision pkgversion="3.10" date="2013-11-07" status="review"/>
     <revision pkgversion="3.12" date="2014-03-02" status="review"/>
+    <revision pkgversion="3.16" date="2015-01-27" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
@@ -18,6 +19,10 @@
     <credit type="editor">
       <name>Michael Hill</name>
       <email its:translate="no">mdhillca@gmail.com</email>
+    </credit>
+    <credit type="editor">
+      <name>Jim Campbell</name>
+      <email its:translate="no">jcampbell@gnome.org</email>
     </credit>
 
     <title type="link" role="trail">Files</title>
@@ -33,18 +38,15 @@
 
   <title>Files, folders &amp; search</title>
 
-  <!-- TODO: would be nice to give this image some styling -->
-  <media type="image" src="figures/nautilus-3-10.png" style="floatend floatright" width="350" if:test="!target:mobile">
-    <p><app>Files</app> file manager</p>
-  </media>
+<section id="common-file-tasks">
+  <title>Common tasks</title>
+  <links type="topic" style="2column"/>
+</section>
 
-<links type="topic" style="linklist nodesc bold">
-  <title>Common tasks</title>
-</links>
-
-<links type="topic" groups="more" style="linklist nodesc bold">
-  <title>More topics</title>
-</links>
+<section id="more-file-tasks">
+  <title>More file-related tasks</title>
+  <links type="topic" style="2column"/>
+</section>
 
 <section id="removable">
   <title>Removable drives and external disks</title>
diff --git a/gnome-help/C/nautilus-connect.page b/gnome-help/C/nautilus-connect.page
index aba9c0f..de6c98a 100644
--- a/gnome-help/C/nautilus-connect.page
+++ b/gnome-help/C/nautilus-connect.page
@@ -3,7 +3,7 @@
       id="nautilus-connect">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
     <link type="guide" xref="sharing"/>
 
     <revision pkgversion="3.6.0" date="2012-10-06" status="review"/>
diff --git a/gnome-help/C/nautilus-file-properties-basic.page b/gnome-help/C/nautilus-file-properties-basic.page
index c30f2c8..241f53a 100644
--- a/gnome-help/C/nautilus-file-properties-basic.page
+++ b/gnome-help/C/nautilus-file-properties-basic.page
@@ -3,7 +3,7 @@
       id="nautilus-file-properties-basic">
 
   <info>
-    <link type="guide" xref="files" group="more"/>
+    <link type="guide" xref="files#more-file-tasks"/>
 
    <desc>View basic file information, set permissions, and choose
    default applications.</desc>
diff --git a/gnome-help/C/nautilus-prefs.page b/gnome-help/C/nautilus-prefs.page
index f59283e..75db2a3 100644
--- a/gnome-help/C/nautilus-prefs.page
+++ b/gnome-help/C/nautilus-prefs.page
@@ -3,18 +3,21 @@
       id="nautilus-prefs">
 
   <info>
-    <link type="guide" xref="files" group="#last"/>
-
+    <link type="guide" xref="files#more-file-tasks"/>   
     <credit type="author">
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <desc>View and set preferences for the file browser.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
+  
 
 <title>File manager preferences</title>
 
-<links type="topic"
-       groups="nautilus-views nautilus-behavior nautilus-display nautilus-list nautilus-preview"/>
+<links type="task"
+       groups="nautilus-views nautilus-behavior nautilus-display nautilus-list
+       nautilus-preview" style="2column">
+</links>
 
-</page>
\ No newline at end of file
+</page>