diff --git a/webapp/web/templates/edit/specific/ents_edit_head.jsp b/webapp/web/templates/edit/specific/ents_edit_head.jsp
index 875fd139f..0f07b1a35 100644
--- a/webapp/web/templates/edit/specific/ents_edit_head.jsp
+++ b/webapp/web/templates/edit/specific/ents_edit_head.jsp
@@ -1,5 +1,5 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
 <%
 
 request.setAttribute("dwrDisabled", new Boolean(false));
@@ -11,23 +11,26 @@ String context = request.getContextPath();
 <%
 if (!(Boolean)request.getAttribute("dwrDisabled")) {
 %>
+<script type="text/javascript">
+    // relinquish jQuery's control of the $ variable to avoid conflicts with DWR
+    jQuery.noConflict();
+</script>
 
 <script type="text/javascript" xml:space="preserve">
     var gEntityURI="${entity.URI}";
 </script> <!-- There has got to be a better way to pass this to the js -->
 
-<script type='text/javascript' src='<%=context%>/dwr/interface/PropertyDWR.js'></script>
-<script type='text/javascript' src='<%=context%>/dwr/interface/EntityDWR.js'></script>
-<script type='text/javascript' src='<%=context%>/dwr/interface/VClassDWR.js'></script>
-<script type='text/javascript' src='<%=context%>/dwr/engine.js'></script>
-<script type='text/javascript' src='<%=context%>/dwr/util.js'></script>
-<script type='text/javascript' src='<%=context%>/js/betterDateInput.js'></script>
-<script type='text/javascript' src='<%=context%>/js/vitro.js'></script>
-<script type='text/javascript' src='<%=context%>/dojo.js'></script>
-<script type='text/javascript' src='<%=context%>/js/ents_edit.js'></script> 
-<script type='text/javascript' src='<%=context%>/js/detect.js'></script>
-<script language="JavaScript" type="text/javascript" src="js/toggle.js"></script>
-
+<script type="text/javascript" src="<%=context%>/dwr/interface/PropertyDWR.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/interface/EntityDWR.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/interface/VClassDWR.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/engine.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/util.js"></script>
+<script type="text/javascript" src="<%=context%>/js/betterDateInput.js"></script>
+<script type="text/javascript" src="<%=context%>/js/vitro.js"></script>
+<script type="text/javascript" src="<%=context%>/dojo.js"></script>
+<script type="text/javascript" src="<%=context%>/js/ents_edit.js"></script>
+<script type="text/javascript" src="<%=context%>/js/detect.js"></script>
+<script type="text/javascript" src="<%=context%>/js/toggle.js"></script>
 
 <%
 } %>
diff --git a/webapp/web/templates/page/basicPage.jsp b/webapp/web/templates/page/basicPage.jsp
index 0e7ac8aee..295f68539 100644
--- a/webapp/web/templates/page/basicPage.jsp
+++ b/webapp/web/templates/page/basicPage.jsp
@@ -59,7 +59,11 @@
 
 <!DOCTYPE html>
 <html lang="en">
-    ${ftl_head}
+    <head>
+        ${ftl_head}
+        
+        <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
+    </head>
     
     <body ${requestScope.bodyAttr}>
             ${ftl_identity}
