diff --git a/app/helpers/subproject_addresses_helper.rb b/app/helpers/subproject_addresses_helper.rb
index 11eaba5..e6313cf 100644
--- a/app/helpers/subproject_addresses_helper.rb
+++ b/app/helpers/subproject_addresses_helper.rb
@@ -2,4 +2,8 @@ module SubprojectAddressesHelper
   def subproject_address_form_fields
     [:streetname, :zipcode, :city, :country, :subproject_id]
   end
+
+  def subproject_address_view_fields
+    [:streetname, :zipcode, :city, :country, :subproject]
+  end
 end
\ No newline at end of file
diff --git a/app/views/subproject_addresses/_subproject_address.erb b/app/views/subproject_addresses/_subproject_address.erb
index 90cda58..0bb8160 100644
--- a/app/views/subproject_addresses/_subproject_address.erb
+++ b/app/views/subproject_addresses/_subproject_address.erb
@@ -1,27 +1,10 @@
-<div id="<%= dom_id subproject_address %>">
-  <p>
-    <strong>Streetname:</strong>
-    <%= subproject_address.streetname %>
-  </p>
-
-  <p>
-    <strong>Zipcode:</strong>
-    <%= subproject_address.zipcode %>
-  </p>
-
-  <p>
-    <strong>City:</strong>
-    <%= subproject_address.city %>
-  </p>
-
-  <p>
-    <strong>Country:</strong>
-    <%= subproject_address.country %>
-  </p>
-
-  <p>
-    <strong>Subproject_ID:</strong>
-    <%= subproject_address.subproject_id %>
-  </p>
-
-</div>
+<% subproject_address_view_fields.each do |attrib| %>
+  <td>
+    <% value = subproject_address.send(attrib) %>
+    <% if attrib == :subproject %>
+      <%= link_to value.subproject_name, subproject_path(value) %>
+    <% else %>
+      <%= value.is_a?(Date) ? l(value) : value %>
+    <% end %>
+  </td>
+<% end %>
\ No newline at end of file
diff --git a/app/views/subproject_addresses/index.html.erb b/app/views/subproject_addresses/index.html.erb
index b094e3c..2b0e531 100644
--- a/app/views/subproject_addresses/index.html.erb
+++ b/app/views/subproject_addresses/index.html.erb
@@ -5,12 +5,23 @@
 <h1>Subproject addresses</h1>
 
 <div id="subproject_addresses">
-  <% @subproject_addresses.each do |subproject_address| %>
-    <%= render subproject_address %>
-    <p>
-      <%= link_to "Show this subproject address", subproject_address %>
-    </p>
-  <% end %>
+  <table>
+    <thead>
+      <tr>
+        <% subproject_address_view_fields.each do |attrib| %>
+          <th><%= attrib.to_s.humanize %></th>
+        <% end %>
+
+      </tr>
+    </thead>
+    <tbody>
+      <% @subproject_addresses.each do |subproject_address| %>
+        <tr id="<%= dom_id subproject_address %>">
+          <%= render subproject_address %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>
 
 <%= link_to "New subproject address", new_subproject_address_path %>
diff --git a/app/views/subproject_addresses/show.html.erb b/app/views/subproject_addresses/show.html.erb
index cbac125..4df2b74 100644
--- a/app/views/subproject_addresses/show.html.erb
+++ b/app/views/subproject_addresses/show.html.erb
@@ -2,9 +2,23 @@
 
 <% content_for :title, "Adresse" %>
 
-<h1>Adresse</h1>
+<h1>Adress:</h1>
 
-<%= render @subproject_address %>
+<div id="subproject_address">
+  <table>
+    <thead>
+      <tr>
+        <% subproject_address_view_fields.each do |attrib| %>
+          <th><%= attrib.to_s.humanize %></th>
+        <% end %>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <%= render @subproject_address %>
+      </tr>
+    </tbody>
+  </table>
 
 <div>
   <%= link_to "Edit this subproject address", edit_subproject_address_path(@subproject_address) %> |