diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index e97bf2652b..cda36070b5 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -194,8 +194,6 @@
             <dashlet id="workitems-completed" label-id="my_workitems_completed_title" description-id="my_workitems_completed_desc"
                   jsp="/jsp/workflow/workitems-completed-dashlet.jsp" allow-narrow="false" />
             <!-- TEMP! -->
-            <dashlet id="process-list" label="Workflows" description="List of workflows you may start"
-                  jsp="/jbpm/process_list.jsp" allow-narrow="true" />
             <dashlet id="my-docs-template" label="My Documents"
                   description="My Documents Template Page"
                   jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
index 304bcfaec3..40676f0844 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java
@@ -30,7 +30,7 @@ public class UIWorkflowSummary extends SelfRenderingComponent
    @Override
    public String getFamily()
    {
-      return "org.alfresco.faces.Workflow";
+      return "org.alfresco.faces.WorkflowSummary";
    }
    
    @Override
diff --git a/source/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java b/source/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
index b12ef2411f..b5b159e9fb 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/WorkflowSummaryTag.java
@@ -32,7 +32,7 @@ public class WorkflowSummaryTag extends HtmlComponentTag
     */
    public String getComponentType()
    {
-      return "org.alfresco.faces.Workflow";
+      return "org.alfresco.faces.WorkflowSummary";
    }
 
    /**
diff --git a/source/web/WEB-INF/faces-config-repo.xml b/source/web/WEB-INF/faces-config-repo.xml
index 9b779c54f9..92ce45138d 100644
--- a/source/web/WEB-INF/faces-config-repo.xml
+++ b/source/web/WEB-INF/faces-config-repo.xml
@@ -144,6 +144,10 @@
       <component-class>org.alfresco.web.ui.repo.component.UIUserGroupPicker</component-class>
    </component>
    
+   <component>
+      <component-type>org.alfresco.faces.WorkflowSummary</component-type>
+      <component-class>org.alfresco.web.ui.repo.component.UIWorkflowSummary</component-class>
+   </component>
    
    <!-- ==================== CONVERTERS ==================== -->
    <component>
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 6ae45b32a1..aeabc86ba8 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -94,24 +94,14 @@
 
    <!--  -->
    <!-- JBPM START -->
+   <!-- Used by the JPBM console for monitoring in-flight workflows -->
    <!-- TODO: Remove this block - just a temporary placement for testing -->
    <!--  -->
    
-   <filter>
-      <filter-name>LogFilter</filter-name>
-      <filter-class>org.jbpm.webapp.filter.LogFilter</filter-class>
-   </filter>
    <filter>
       <filter-name>JbpmContextFilter</filter-name>
       <filter-class>org.jbpm.webapp.filter.JbpmContextFilter</filter-class>
-<!--   <filter-class>org.jbpm.webapp.filter.JbpmContextFilter</filter-class> -->
    </filter>
-<!-- 
-   <filter>
-      <filter-name>JbpmAuthenticationFilter</filter-name>
-      <filter-class>org.jbpm.webapp.filter.AuthenticationFilter</filter-class>
-   </filter>
--->
 
    <!--  -->
    <!-- JBPM END -->
@@ -138,31 +128,14 @@
    
   <!--  -->
    <!-- JBPM START -->
+   <!-- Used by the JPBM console for monitoring in-flight workflows -->
    <!-- TODO: Remove this block - just a temporary placement for testing -->
    <!--  -->
 
-   <filter-mapping>
-      <filter-name>LogFilter</filter-name>
-      <url-pattern>/faces/jbpm/*</url-pattern>
-   </filter-mapping>
    <filter-mapping>
       <filter-name>JbpmContextFilter</filter-name>
       <url-pattern>/faces/jbpm/*</url-pattern>
    </filter-mapping>
-   <filter-mapping>
-      <filter-name>JbpmContextFilter</filter-name>
-      <url-pattern>/processimage</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-      <filter-name>JbpmContextFilter</filter-name>
-      <url-pattern>/faces/jsp/dashboards/*</url-pattern>
-   </filter-mapping>
-<!-- 
-   <filter-mapping>
-      <filter-name>JbpmAuthenticationFilter</filter-name>
-      <url-pattern>/faces/jbpm/*</url-pattern>
-   </filter-mapping>   
--->
 
    <!--  -->
    <!-- JBPM END -->
@@ -241,30 +214,6 @@
       <servlet-name>JBPMDeployProcessServlet</servlet-name>
       <servlet-class>org.alfresco.web.app.servlet.JBPMDeployProcessServlet</servlet-class>
    </servlet>
-      
-      
-   <!--  -->
-   <!-- JBPM START -->
-   <!-- TODO: Remove this block - just a temporary placement for testing -->
-   <!--  -->
-
-<!-- 
-   <servlet>
-      <servlet-name>JbpmThreadsServlet</servlet-name>
-      <servlet-class>org.jbpm.web.JbpmThreadsServlet</servlet-class>
-      <load-on-startup>1</load-on-startup>
-   </servlet>
--->
-
-   <!-- jBPM FileServlet -->
-   <servlet>
-      <servlet-name>ProcessImageServlet</servlet-name>
-      <servlet-class>org.jbpm.webapp.servlet.ProcessImageServlet</servlet-class>
-   </servlet>
-
-   <!--  -->
-   <!-- JBPM END -->
-   <!--  -->
             
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>
@@ -316,28 +265,6 @@
       <url-pattern>/jbpm/deployprocess</url-pattern>
    </servlet-mapping>
 
-   <!--  -->
-   <!-- JBPM START -->
-   <!-- TODO: Remove this block - just a temporary placement for testing -->
-   <!--  -->
-   
-<!-- 
-   <servlet-mapping>
-      <servlet-name>JbpmThreadsServlet</servlet-name>
-      <url-pattern>/threads</url-pattern>
-   </servlet-mapping> 
--->
-   
-   <!-- jBPM FileServlet -->
-   <servlet-mapping>
-      <servlet-name>ProcessImageServlet</servlet-name>
-      <url-pattern>/processimage</url-pattern>
-   </servlet-mapping>
-
-   <!--  -->
-   <!-- JBPM END -->
-   <!--  -->
-
    <session-config>
       <session-timeout>60</session-timeout>
    </session-config>
diff --git a/source/web/jsp/admin/admin-console.jsp b/source/web/jsp/admin/admin-console.jsp
index 1afb36f029..ae88d603fc 100644
--- a/source/web/jsp/admin/admin-console.jsp
+++ b/source/web/jsp/admin/admin-console.jsp
@@ -126,6 +126,12 @@
                                     <tr>
                                        <td><a:actionLink value="#{msg.node_browser}" image="/images/icons/node_browser.gif" action="dialog:showNodeBrowser" styleClass="title" /></td>
                                     </tr>
+                                    <tr>
+                                       <td>
+                                          <img src="<%=request.getContextPath()%>/images/icons/workflow.gif" align="absmiddle" />
+                                          <h:outputLink value="/alfresco/faces/jbpm/home.jsp" styleClass="title"><h:outputText value="jBPM Console" /></h:outputLink>
+                                       </td>
+                                    </tr>
                                  </table>
                                  <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "ballongrey"); %>
                            
diff --git a/source/web/jsp/workflow/workitems-completed-dashlet.jsp b/source/web/jsp/workflow/workitems-completed-dashlet.jsp
index 969aeb8bc8..567084b4c4 100644
--- a/source/web/jsp/workflow/workitems-completed-dashlet.jsp
+++ b/source/web/jsp/workflow/workitems-completed-dashlet.jsp
@@ -27,14 +27,6 @@
       <h:outputText value="#{r['bpm:taskId']}" />
    </a:column>
    
-   <%-- Type column --%>
-   <a:column style="text-align:left">
-      <f:facet name="header">
-         <a:sortLink label="#{msg.type}" value="type" styleClass="header"/>
-      </f:facet>
-      <h:outputText value="#{r.type}" />
-   </a:column>
-   
    <%-- Source column --%>
    <a:column style="text-align:left">
       <f:facet name="header">
diff --git a/source/web/jsp/workflow/workitems-todo-dashlet.jsp b/source/web/jsp/workflow/workitems-todo-dashlet.jsp
index 1bae631b80..a98a7559e5 100644
--- a/source/web/jsp/workflow/workitems-todo-dashlet.jsp
+++ b/source/web/jsp/workflow/workitems-todo-dashlet.jsp
@@ -35,14 +35,6 @@
       <h:outputText value="#{r['bpm:taskId']}" />
    </a:column>
    
-   <%-- Type column --%>
-   <a:column style="text-align:left">
-      <f:facet name="header">
-         <a:sortLink label="#{msg.type}" value="type" styleClass="header"/>
-      </f:facet>
-      <h:outputText value="#{r.type}" />
-   </a:column>
-   
    <%-- Source column --%>
    <a:column style="text-align:left">
       <f:facet name="header">