Index: /waeup/branches/ulif-layout/src/waeup/browser/templates/facultycontainerpage.pt
===================================================================
--- /waeup/branches/ulif-layout/src/waeup/browser/templates/facultycontainerpage.pt	(revision 4645)
+++ /waeup/branches/ulif-layout/src/waeup/browser/templates/facultycontainerpage.pt	(revision 4645)
@@ -0,0 +1,9 @@
+  <h2>Registered Faculties</h2>
+
+  <div tal:condition="python: not len(context.keys())">
+    There are no faculties registered yet.
+  </div>
+
+  <div name="thefacultytable" tal:condition="python: len(context.keys())">
+    <div tal:replace="structure view/table/renderHTML" />
+  </div>
Index: /waeup/branches/ulif-layout/src/waeup/browser/templates/gotofacultiesaction.pt
===================================================================
--- /waeup/branches/ulif-layout/src/waeup/browser/templates/gotofacultiesaction.pt	(revision 4645)
+++ /waeup/branches/ulif-layout/src/waeup/browser/templates/gotofacultiesaction.pt	(revision 4645)
@@ -0,0 +1,10 @@
+<span class="yui-button yui-link-button" noclass="actionbarlink">
+  <span class="first-child">
+    <a href="" id="linkbutton1"
+       tal:attributes="href python: view.url(
+		       context, 'faculties')">
+      <img alt="edit"
+	   tal:attributes="src static/actionicon_manage.png"/>
+    <span>Browse faculties</span></a>
+  </span>
+</span>
Index: eup/branches/ulif-layout/src/waeup/browser/templates/managefacultiesaction.pt
===================================================================
--- /waeup/branches/ulif-layout/src/waeup/browser/templates/managefacultiesaction.pt	(revision 4644)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<span class="yui-button yui-link-button" noclass="actionbarlink">
-  <span class="first-child">
-    <a href="" id="linkbutton1"
-       tal:attributes="href python: view.url(
-		       context, 'faculties')">
-      <img alt="edit"
-	   tal:attributes="src static/actionicon_manage.png"/>
-    <span>Browse faculties</span></a>
-  </span>
-</span>
