diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.desc.xml
new file mode 100644
index 0000000000..da096d7054
--- /dev/null
+++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+  <shortname>DocLib Custom View</shortname>
+  <description>Collaboration Document Library view</description>
+  <url>/collaboration/docLibrary?nodeRef={noderef}</url>
+  <format default="html"/>
+  <authentication>user</authentication>
+  <transaction>required</transaction>
+</webscript>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl
new file mode 100644
index 0000000000..716e91ed28
--- /dev/null
+++ b/config/alfresco/templates/webscripts/org/alfresco/collaboration/docLibrary.get.html.ftl
@@ -0,0 +1,84 @@
+<#assign doclib = companyhome.nodeByReference[args["nodeRef"]]>
+<table id="collabContainer" cellspacing="0" cellpadding="2" width="100%">
+   <tr>
+      <td valign="top">
+
+         <div class="collabHeader">
+            <span>Recent Changes</span>
+         </div>
+
+         <div class="collabContent">
+         
+            <table width="100%" cellpadding="16" cellspacing="0">
+               <tr valign="top">
+                  <td>
+   <#list doclib.childrenByXPath[".//*[subtypeOf('cm:content')]"] as child>
+      <#if (dateCompare(child.properties["cm:modified"], date, 1000*60*60*24*7) == 1) || (dateCompare(child.properties["cm:created"], date, 1000*60*60*24*7) == 1)>
+   	<div class="docLib">
+         <a href="${url.context}${child.url}" target="new"><img src="${url.context}${child.icon16}" border=0></a>
+   	   <div class="docLibName">
+            <a href="${url.context}${child.url}" target="new">${child.properties.name}</a>
+   	   </div>
+   	   <div class="docLibProperty">
+   	   <#if dateCompare(child.properties["cm:modified"], child.properties["cm:created"], 100, "==") == 1>
+            Created
+         <#else>
+            Modified
+         </#if>
+   	   </div>
+   	   <div class="docLibProperty">
+            ${child.properties["cm:modified"]?datetime}
+   	   </div>
+   	</div>
+      </#if>
+   </#list>
+                  </td>
+               </tr>
+            </table>
+
+         </div>
+         <div class="collabFooter">
+            <span>&nbsp;</span>
+         </div>
+
+      </td>
+   </tr>
+</table>
+
+<style>
+/* Main Container elements */
+#collabContainer {
+   width: 100%;
+}
+
+.collabHeader {
+   background: url(${url.context}/images/parts/collab_topleft.png) no-repeat left top;
+   margin: 0px -1px;
+   padding: 0px 0px 0px 8px;
+}
+.collabHeader span {
+   background: url(${url.context}/images/parts/collab_topright.png) no-repeat right top;
+   display: block;
+   float: none;
+   padding: 5px 15px 4px 6px;
+   font-weight: bold;
+   font-size: 10pt;
+}
+
+.collabContent {
+   border-left: 1px solid #B9BEC4;
+   border-right: 1px solid #B9BEC4;
+}
+
+.collabFooter {
+   background: url(${url.context}/images/parts/collab_bottomleft.png) no-repeat left top;
+   margin: 0px;
+   padding: 0px 0px 0px 4px;
+}
+.collabFooter span {
+   background: url(${url.context}/images/parts/collab_bottomright.png) no-repeat right top;
+   display: block;
+   float: none;
+   padding: 5px 15px 4px 6px;
+}
+</style>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl
index 3902214fbf..daaae03e6f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.atom.ftl
@@ -26,7 +26,7 @@
 <#list search.results as row>
   <entry>
     <title>${row.properties.firstName} ${row.properties.lastName}</title>
-    <link rel="alternate" href="${absurl(url.serviceContext)}"/>
+    <link rel="alternate" href="${absurl(url.context)}/c/ui/userprofile?id=${row.id}"/>
 <#if row.assocs["cm:avatar"]?exists>
     <icon>${absurl(url.context)}${row.assocs["cm:avatar"][0].url}</icon>
 <#else>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl
index 85f75ca9b6..4bc6803cfd 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.html.ftl
@@ -24,7 +24,7 @@
     <table>
 <#list search.results as row>            
       <tr>
-      <td><img src="${url.context}${row.assocs[\"cm:avatar\"][0].url}"/></td><td>${row.firstName} ${row.lastName}</td>
+      <td><img src="${url.context}${row.assocs[\"cm:avatar\"][0].url}"/></td><td><a href="${absurl(url.context)}/c/ui/userprofile?id=${row.id}">${row.firstName} ${row.lastName}</a></td>
       </tr>
       <tr>
       <td></td>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl
index 7029710971..5ef6ccd3c5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.portlet.ftl
@@ -7,7 +7,7 @@
     <table>
 <#list search.results as row>            
       <tr>
-      <td><img src="${url.context}${row.assocs[\"cm:avatar\"][0].url}"/></td><td>${row.firstName} ${row.lastName}</td>
+      <td><img src="${url.context}${row.assocs[\"cm:avatar\"][0].url}"/></td><td><a href="${absurl(url.context)}/c/ui/userprofile?id=${row.id}">${row.firstName} ${row.lastName}</a></td>
       </tr>
       <tr>
       <td></td>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl
index 8d772a03e8..729c7aa9b5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/personsearch.get.rss.ftl
@@ -31,7 +31,7 @@
 <#list search.results as row>            
   <item>
     <title>${row.firstName} ${row.lastName}</title>
-    <link>${absurl(url.serviceContext)}</link>
+    <link>${absurl(url.context)}/c/ui/userprofile?id=${row.id}</link>
     <description>
       <#if row.properties.jobtitle??>${row.properties.jobtitle},</#if>
       <#if row.properties.organization??>${row.properties.organization},</#if>