diff --git a/config/alfresco/templates/client/task_resource_panel.ftl b/config/alfresco/templates/client/task_resource_panel.ftl
index 9938c9cef9..66dc878f3c 100644
--- a/config/alfresco/templates/client/task_resource_panel.ftl
+++ b/config/alfresco/templates/client/task_resource_panel.ftl
@@ -4,7 +4,7 @@
 |
<#if res.isDocument>
- ${res.name}
+ ${res.name}
<#else>
${res.name}
#if>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
index 65f6ebe89f..731461c87d 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist_get_html.ftl
@@ -2,13 +2,9 @@
-
-
-
-
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl
index 4d5ede7a63..0705e66da5 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytasks_get_html.ftl
@@ -2,13 +2,9 @@
-
-
-
-
-
+
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl
index 2eee62ada0..da69ee7713 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms_get_html.ftl
@@ -2,13 +2,9 @@
-
-
-
-
-
+
diff --git a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
index 05915f004e..b65b3500e3 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/PageTag.java
@@ -174,25 +174,15 @@ public class PageTag extends TagSupport
out.write(reqPath);
out.write("/scripts/ajax/yahoo/connection/connection-min.js\">");
- // DOM handling
- out.write("");
-
// event handling
out.write("");
- // animation
+ // mootools
out.write("");
-
- // drag-drop
- out.write("");
+ out.write("/scripts/ajax/mootools.v1.1.js\">");
// common Alfresco util methods
out.write(" |