diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index c68459d..532fd6d 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -1,22 +1,27 @@
-<div id="<%= dom_id project %>">
-  <% project_view_fields.each do |attrib| %>
-    <p>
-      <strong><%= attrib.to_s.humanize %>:</strong>
-      <%= value = project.send(attrib) %>
+<% project_view_fields.each do |attrib| %>
+  <td>
+    <% value = project.send(attrib) %>
+    <% if attrib == :name %>
+      <%= link_to value, project_path(project) %>
+    <% elsif attrib == :email %>
+      <%= mail_to value %>
+    <% else %>
       <%= value.is_a?(Date) ? l(value) : value %>
-    </p>
+    <% end %>
+  </td>
+<% end %>
+<% if project.subprojects.any? %>
+<td>
+  <ul>
+  <% project.subprojects.each do |subproject| %>
+    <li>
+      <%= link_to "#{subproject.subproject_name}", subproject_path(subproject) %>
+    </li>
   <% end %>
-
-  <% if project.subprojects.any? %>
-    <ul>
-      <% project.subprojects.each do |subproject| %>
-        <li>
-          <%= link_to "#{subproject.subproject_name}", subproject_path(subproject) %>
-        </li>
-      <% end %>
-    </ul>
-  <% else %>
-    <p>No subprojects</p>
-  <% end %>
-
-</div>
+  </ul>
+</td>
+<% else %>
+  <td>
+    No subprojects
+  </td>
+<% end %>
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index 79f6079..b377188 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -5,12 +5,23 @@
 <h1>Projects</h1>
 
 <div id="projects">
-  <% @projects.each do |project| %>
-    <%= render project %>
-    <p>
-      <%= link_to "Show this project", project %>
-    </p>
-  <% end %>
+  <table>
+    <thead>
+      <tr>
+        <% project_view_fields.each do |attrib| %>
+          <th><%= attrib.to_s.humanize %></th>
+        <% end %>
+        <th>Subprojects</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @projects.each do |project| %>
+        <tr id="<%= dom_id project %>">
+          <%= render project %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>
 
 <%= link_to "New project", new_project_path %>