diff --git a/core/src/main/resources/hudson/model/TreeView/main.jelly b/core/src/main/resources/hudson/model/TreeView/main.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..83541d99e951a05e75a88a015673c0336adc2326
--- /dev/null
+++ b/core/src/main/resources/hudson/model/TreeView/main.jelly
@@ -0,0 +1,11 @@
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <j:choose>
+    <j:when test="${empty(items)}">
+      <st:include page="noJob.jelly" />
+    </j:when>
+    <j:otherwise>
+      <!-- set @jobBaseUrl="" so that links to jobs will be under this view. -->
+      <t:projectView jobs="${items}" jobBaseUrl="" views="${it.views}" />
+    </j:otherwise>
+  </j:choose>
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index 94febcb3f6b24d31ee066c50ac1fa609501eb85c..0be22b0cfc390621639c6788043fc2b06a0137dc 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -7,6 +7,8 @@
 
   @indenter:
      optional Indenter instance used to indent items.
+  @views:
+     if non-null, render nested views
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
@@ -34,8 +36,21 @@
           </th>
         </tr>
 
+        <j:forEach var="v" items="${attrs.views}">
+          <tr>
+            <td colspan="2" style="text-align: center">
+              <img src="${imagesURL}/${iconSize}/folder.gif" alt="" />
+            </td>
+            <td colspan="5">
+              <a href="${rootURL}/${v.url}">
+                ${v.viewName}
+              </a>
+            </td>
+          </tr>
+        </j:forEach>
+
         <j:forEach var="job" items="${jobs}">
-          <t:projectViewRow job="${job}" indenter="${indenter}"/>
+          <t:projectViewRow />
         </j:forEach>
       </table>
       <t:rssBar-with-iconSize/>
diff --git a/core/src/main/resources/lib/hudson/projectViewRow.jelly b/core/src/main/resources/lib/hudson/projectViewRow.jelly
index 17e136d8f2631943ba0c3fbb202e2e4db7186280..0e0556878999e87d96a96ce9f1b577430d9de8ff 100644
--- a/core/src/main/resources/lib/hudson/projectViewRow.jelly
+++ b/core/src/main/resources/lib/hudson/projectViewRow.jelly
@@ -1,8 +1,8 @@
 <!--
 
-  Variables:
-    job : job to draw
-    indenter
+  Attributes:
+    @job : job to draw
+    @indenter
 -->
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
diff --git a/war/resources/images/32x32/folder.gif b/war/resources/images/32x32/folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..22ead83bcbdbc630978c66fb61f8b255de318c64
Binary files /dev/null and b/war/resources/images/32x32/folder.gif differ