diff --git a/app/models/map.rb b/app/models/map.rb
index 166afb4a..980173cc 100644
--- a/app/models/map.rb
+++ b/app/models/map.rb
@@ -81,12 +81,17 @@ class Map < ActiveRecord::Base
 
   def to_csv(options = {})
     CSV.generate(options) do |csv|
-      csv << ["id", "name", "metacode", "desc", "link", "user.name", "permission", "synapses"]
-      self.topics.each do |topic|
+      csv << ["topics"]
+      csv << ["id", "name", "metacode", "x", "y", "desc", "link", "user.name", "permission"]
+      self.topicmappings.each do |mapping|
+        topic = mapping.mappable
+        next if topic.nil?
         csv << [
           topic.id,
           topic.name,
           topic.metacode.name,
+          mapping.x,
+          mapping.y,
           topic.desc,
           topic.link,
           topic.user.name,
@@ -94,6 +99,20 @@ class Map < ActiveRecord::Base
           topic.synapses_csv("text")
         ]
       end
+      csv << []
+      csv << ["synapses"]
+      csv << ["id", "description", "category", "topic1", "topic2", "username", "permission"]
+      self.synapses.each do |synapse|
+        csv << [
+          synapse.id,
+          synapse.desc,
+          synapse.category,
+          synapse.node1_id,
+          synapse.node2_id,
+          synapse.user.name,
+          synapse.permission
+        ]
+      end
     end
   end
 
diff --git a/app/views/maps/show.xls.erb b/app/views/maps/show.xls.erb
index d00dd36e..4b22257e 100644
--- a/app/views/maps/show.xls.erb
+++ b/app/views/maps/show.xls.erb
@@ -1,26 +1,51 @@
 <table>
+  <tr><th>Topics</th></tr>
   <tr>
     <th>ID</th>
     <th>Name</th>
     <th>Metacode</th>
+    <th>X</th>
+    <th>Y</th>
     <th>Description</th>
     <th>Link</th>
     <th>Username</th>
     <th>Permission</th>
-    <th>Synapses</th>
   </tr>
-  <% @map.topics.each do |topic| %>
+  <% @map.topicmappings.each do |mapping| %>
+  <% topic = mapping.mappable %>
+  <% next if topic.nil? %>
   <tr>
     <td><%= topic.id %></td>
     <td><%= topic.name %></td>
     <td><%= topic.metacode.name %></td>
+    <td><%= mapping.xloc %></td>
+    <td><%= mapping.yloc %></td>
     <td><%= topic.desc %></td>
     <td><%= topic.link %></td>
     <td><%= topic.user.name %></td>
     <td><%= topic.permission %></td>
-    <% topic.synapses_csv.each do |s_text| %>
-      <td><%= s_text %></td>
-    <% end %>
+  </tr>
+  <% end %>
+  <tr></tr>
+  <tr><th>Synapses</th></tr>
+  <tr>
+    <th>ID</th>
+    <th>Description</th>
+    <th>Category</th>
+    <th>Topic1</th>
+    <th>Topic2</th>
+    <th>Username</th>
+    <th>Permission</th>
+  </tr>
+  <% @map.synapses.each do |synapse| %>
+  <tr>
+    <td><%= synapse.id %></td>
+    <td><%= synapse.desc %></td>
+    <td><%= synapse.category %></td>
+    <td><%= synapse.node1_id %></td>
+    <td><%= synapse.node2_id %></td>
+    <td><%= synapse.user.name %></td>
+    <td><%= synapse.permission %></td>
   </tr>
   <% end %>
 </table>