diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 78d662a..e677403 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -3,7 +3,7 @@ class ProjectsController < ApplicationController
 
   # GET /projects or /projects.json
   def index
-    @projects = Project.all
+    @projects = Project.includes(:subprojects => [:client, :owner, :builder]).all
   end
 
   # GET /projects/1 or /projects/1.json
@@ -13,7 +13,7 @@ class ProjectsController < ApplicationController
   # GET /projects/new
   def new
     @project = Project.new
-    @project.subprojects.build # initialize one subproject
+    @project.subprojects.build
     @project.subprojects.each do |subproject|
       subproject.build_client
       subproject.build_owner
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index b96910c..532806a 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -2,6 +2,18 @@
   <p>
     <strong>Name:</strong>
     <%= project.name %>
+    <% 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 %>
+
   </p>
 
 </div>