diff --git a/tracks/app/views/data/export.rhtml b/tracks/app/views/data/export.rhtml
deleted file mode 100644
index 5bb147fa..00000000
--- a/tracks/app/views/data/export.rhtml
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="feeds">
-	<div id="feedlegend">
-		<h3>Exporting data</h3>
-	  <p>You can choose between the following formats:</p>
-	  <ul>
-	    <li><strong>YAML: </strong>Best for porting data between Tracks installations</li>
-	    <li><strong>CSV: </strong>Best for importing into spreadsheet or data analysis software</li>
-	    <li><strong>XML: </strong>Best for importing or repurposing the data</li>
-	  </ul
-	</div>
-
-<p>
-<table class="users_table">
-<tr>
-  <th>Description</th>
-  <th>Download link</th>
-</tr>
-<tr>
-<td>YAML file containing all your actions, contexts, projects, tags and notes</td>
-<td><%= link_to "YAML file", :controller => 'data', :action => 'yaml_export' %></td>
-</tr>
-<tr>
-<td>CSV file containing all of your actions, with named contexts and projects</td>
-<td><%= link_to "CSV file (actions, contexts and projects)", :controller => 'data', :action => 'csv_actions' %></td>
-</tr>
-<tr>
-  <td>CSV file containing all your notes</td>
-  <td><%= link_to "CSV file (notes only)", :controller => 'data', :action => 'csv_notes' %></td>
-</tr>
-<tr>
-  <td>XML file containing all your actions, contexts, projects, tags and notes</td>
-  <td><%= link_to "XML file (actions only)", :controller => 'data', :action => 'xml_export' %></td>
-</tr>
-</table>
-</p>
-	
-</div><!-- End of feeds -->
\ No newline at end of file
diff --git a/tracks/app/views/data/import.rhtml b/tracks/app/views/data/import.rhtml
deleted file mode 100644
index 36b67651..00000000
--- a/tracks/app/views/data/import.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="display_box">
-	<div id="feeds">
-	<div id="feedlegend">
-		<h3>Importing data</h3>
-	  <p>You can choose between the following formats:</p>
-	  <ul>
-	    <li><strong>YAML: </strong>Best for porting data between Tracks installations</li>
-	    <li><strong>CSV: </strong>Best for importing into spreadsheet or data analysis software</li>
-	  </ul
-	</div>
-	
-	<ul>
-		<li>YAML</li>
-		<li>CSV</li>
-	</ul>
-	
-	</div><!-- End of feeds -->
-</div><!-- End of display_box -->
\ No newline at end of file
diff --git a/tracks/app/views/data/index.rhtml b/tracks/app/views/data/index.rhtml
index 10d15e6d..5bb147fa 100644
--- a/tracks/app/views/data/index.rhtml
+++ b/tracks/app/views/data/index.rhtml
@@ -1,15 +1,37 @@
-<div id="display_box">
-	<div id="feeds">
+<div id="feeds">
 	<div id="feedlegend">
-		<h3>Importing and exporting data into Tracks</h3>
-	  <p>You can export your data in a number of different forms. Note: you can only export/import your own data (i.e. the data available when you are logged in).</p>
+		<h3>Exporting data</h3>
+	  <p>You can choose between the following formats:</p>
+	  <ul>
+	    <li><strong>YAML: </strong>Best for porting data between Tracks installations</li>
+	    <li><strong>CSV: </strong>Best for importing into spreadsheet or data analysis software</li>
+	    <li><strong>XML: </strong>Best for importing or repurposing the data</li>
+	  </ul
 	</div>
+
+<p>
+<table class="users_table">
+<tr>
+  <th>Description</th>
+  <th>Download link</th>
+</tr>
+<tr>
+<td>YAML file containing all your actions, contexts, projects, tags and notes</td>
+<td><%= link_to "YAML file", :controller => 'data', :action => 'yaml_export' %></td>
+</tr>
+<tr>
+<td>CSV file containing all of your actions, with named contexts and projects</td>
+<td><%= link_to "CSV file (actions, contexts and projects)", :controller => 'data', :action => 'csv_actions' %></td>
+</tr>
+<tr>
+  <td>CSV file containing all your notes</td>
+  <td><%= link_to "CSV file (notes only)", :controller => 'data', :action => 'csv_notes' %></td>
+</tr>
+<tr>
+  <td>XML file containing all your actions, contexts, projects, tags and notes</td>
+  <td><%= link_to "XML file (actions only)", :controller => 'data', :action => 'xml_export' %></td>
+</tr>
+</table>
+</p>
 	
-			<ul>
-			  <li>Import</li>
-        <li>
-          <%= link_to "Export", :controller => 'data', :action => 'export' %>
-        </li>
-			</ul>
-	</div><!-- End of feeds -->
-</div><!-- End of display_box -->
\ No newline at end of file
+</div><!-- End of feeds -->
\ No newline at end of file
diff --git a/tracks/app/views/layouts/standard.rhtml b/tracks/app/views/layouts/standard.rhtml
index f3a1fdc4..e96fb27f 100644
--- a/tracks/app/views/layouts/standard.rhtml
+++ b/tracks/app/views/layouts/standard.rhtml
@@ -50,7 +50,7 @@ window.onload=function(){
   <li><%= navigation_link( "Done", done_path, {:accesskey=>"d", :title=>"Completed"} ) %></li>
   <li><%= navigation_link( "Notes", notes_path, {:accesskey => "o", :title => "Show all notes"} ) %></li>
   <li><%= navigation_link( "Preferences", preferences_path, {:accesskey => "u", :title => "Show my preferences"} ) %></li>
-  <li><%= navigation_link( "Import/Export", {:controller => "data", :action => "index"}, {:accesskey => "i", :title => "Import and export data"} ) %></li>
+  <li><%= navigation_link( "Export", {:controller => "data", :action => "index"}, {:accesskey => "i", :title => "Import and export data"} ) %></li>
   <% if current_user.is_admin? -%>
     <li><%= navigation_link("Admin", users_path, {:accesskey => "a", :title => "Add or delete users"} ) %></li>
   <% end -%>