diff --git a/handbook/index.htm b/handbook/index.htm
index 821421b97..55bb7fa67 100644
--- a/handbook/index.htm
+++ b/handbook/index.htm
@@ -36,18 +36,23 @@ Need to get in touch with someone? Look here.
 <h2>Computing</h2>
 This is a scientific expedition - the Austrian government allows us to wander around the plateau in exchange for cave surveys. Learn how to contribute!
 <ul>
-  <li><a href="computing/ftpusage.html">Basic FTP setup</a> - Instructions for Windows, Android and Linux on how to upload files to expo server.</li>
+  <li><a href="computing/ftpusage.html">Basic FTP setup</a> - Instructions for Windows, Android and Linux on <strong>how to upload files (and photos)</strong> to expo server.</li>
+  <li><a href="uploading.html">Uploading photos</a> - More detailed description on photos management.</li>
+  
   <li><a href="computing/repousage.html">Basic repositories setup</a> - Instructions for Windows and Linux on repository setup.</li>
-  <li><a href="essentials.html">Cave locations</a> - How to download locations of known caves.</li>
-  <li><a href="gpxupload.html">Phone GPS</a> - How to upload location of the cave you've found.</li>
+  
+  <li><a href="getsurvex.html">Getting software</a> - How to get and set-up survey creation software.</li>
+  
   <li><a href="survey/newcave.html">Recording newly found caves</a> - What and how to record. (important!)</li>
   <li><a href="logbooks.html">Logbook</a> - Adding trip notes and cave descriptions.</li>
-  <li><a href="datamgt.html">Cave data management</a> - General guidelines about keeping records.</li>
-  <li><a href="getsurvex.html">Getting Survex</a> - How to set-up centerline preview software.</li>
-  <li><a href="uploading.html">Uploading photos</a> - How to add visuals to your trips.</li>
-  <li><a href="exposerver.html">Expo Server</a> - Master archive of expo data and webpage.</li>
-  <li><a href="nerd.html">Experienced laptop setup</a> - Surveying, data management, version control etc.</li>
-  <li><a href="onlinesystems.html">Gandalf-grade computing info</a> - Online Systems and Data: Catalog structure, access and update.</li>
+  
+  <li><a href="onlinesystems.html">Expo online systems</a> - Overview of expo server capabilites.</li>
+
+  <i>Broken:
+  <li><a href="essentials.html">Cave locations</a> - How to download locations of known caves.</li>
+  <li><a href="gpxupload.html">Phone GPS</a> - How to upload location of the cave you've found.</li>
+  </i>
+  
   <br>
   <li><a href="survey/status.html">Trip report status</a> - Missing .svx's, missing tunnel drawings etc.</li>
 </ul>
@@ -92,6 +97,7 @@ Things that are likely to be relevant at basecamp.
 
 <h2>Misc</h2>
 <ul>
+  <li><a href="datamgt.html">Cave data management</a> - Paragraph long corporate philosophy blurb.</li>
   <li><a href="vocab.htm">Travelling cavers phrases</a> - Vocabulary in (German, Spanish, French).</li>
   <li><a href="planning.html">Expo Planning Guide</a> - How to plan and orgnise expo.</li>
   <li><a href="leader.htm">Expo leader checklist</a> - For leaders: check these before you leave UK.</li>