Index: /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/breadcrumbs.py
===================================================================
--- /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/breadcrumbs.py	(revision 5350)
+++ /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/breadcrumbs.py	(revision 5351)
@@ -71,5 +71,5 @@
     """
     grok.context(interfaces.IFacultyContainer)
-    title = u'Faculties'
+    title = u'Academics'
 
 class AdministrationBreadcrumb(Breadcrumb):
Index: /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/viewlets.py
===================================================================
--- /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/viewlets.py	(revision 5350)
+++ /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/viewlets.py	(revision 5351)
@@ -227,6 +227,6 @@
 class ManageLink(grok.Viewlet):
     grok.viewletmanager(LeftSidebar)
-    grok.context(IUniversity)
-    grok.view(UniversityPage)
+    #grok.context(IUniversity)
+    #grok.view(UniversityPage)
     grok.order(5)
     # This link is only displayed, if the user is
@@ -235,5 +235,8 @@
     
     def render(self):
-        return u'<div class="portlet"><a href="manage">Settings</a></div>'
+        return u'<div class="portlet"><a href="%s">Portal Settings</a></div>' % (
+            self.view.application_url('manage'))        
+        
+        
 
 class ManageFacultiesLink(grok.Viewlet):
@@ -247,25 +250,28 @@
     
     def render(self):
-        return u'<div class="portlet"><a href="faculties">Manage faculties</a></div>'
+        #return u'<div class="portlet"><a href="faculties">Manage Faculties</a></div>'
+        return ''
 
 class ManageUsersLink(grok.Viewlet):
     grok.viewletmanager(LeftSidebar)
-    grok.context(IUniversity)
-    grok.view(UniversityPage)
+    #grok.context(IUniversity)
+    #grok.view(UniversityPage)
     grok.order(6)
     grok.require('waeup.manageUsers')
 
     def render(self):
-        return u'<div class="portlet"><a href="users">Manage users</a></div>'
+        return u'<div class="portlet"><a href="%s">Portal Users</a></div>' % (
+            self.view.application_url('users'))  
 
 class ManageDataCenter(grok.Viewlet):
     grok.viewletmanager(LeftSidebar)
-    grok.context(IUniversity)
-    grok.view(UniversityPage)
+    #grok.context(IUniversity)
+    #grok.view(UniversityPage)
     grok.order(6)
     grok.require('waeup.manageUniversity')
 
     def render(self):
-        return u'<div class="portlet"><a href="datacenter">Data Center</a></div>'
+        return u'<div class="portlet"><a href="%s">Data Center</a></div>' % (
+            self.view.application_url('datacenter'))  
 
 #
@@ -514,5 +520,5 @@
 
     pnav = 1
-    tab_title = u'Faculties'
+    tab_title = u'Academics'
 
     @property
