diff --git a/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp b/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
index d364fb6..bc1b3d8 100644
--- a/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
+++ b/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
@@ -19,7 +19,6 @@
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>
@@ -29,18 +28,21 @@
       <meta http-equiv="refresh" content="60"/>
     </head>
     <body>
-      <c:if test="${!empty actionErrors}">
-        <div class="errormessage">
-          <s:iterator value="actionErrors">
-            <p><s:text name="<s:property/>" /></p>
-          </s:iterator>
-        </div>
-      </c:if>
-      
+
+    <s:if test="hasActionErrors()">
+      <div class="errormessage">
+        <s:actionerror/>
+      </div>
+    </s:if>
+    <s:if test="hasActionMessages()">
+      <div class="warningmessage">
+        <s:actionmessage/>
+      </div>
+    </s:if>
       
         <div id="h3">
           <h3><s:text name="distributedBuilds.currentBuild.section.title"/></h3>
-          <c:if test="${not empty currentDistributedBuilds}">
+          <s:if test="currentDistributedBuilds.size() > 0">
             <s:set name="currentDistributedBuilds" value="currentDistributedBuilds" scope="request"/>
             <ec:table items="currentDistributedBuilds"
                       var="currentBuild"
@@ -53,9 +55,9 @@
               <ec:row>
                 <ec:column property="projectUrl" title="distributedBuild.table.projectName">
                   <s:url id="viewUrl" action="buildResults">
-                    <s:param name="projectId"><c:out value="${pageScope.currentBuild.projectId}"/></s:param>
+                    <s:param name="projectId" value="#attr.currentBuild.projectId"/>
                   </s:url>
-                  <s:a href="%{viewUrl}"><c:out value="${pageScope.currentBuild.projectName}"/></s:a>
+                  <s:a href="%{viewUrl}"><s:property value="#attr.currentBuild.projectName"/></s:a>
                 </ec:column>
                 <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
                 <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
@@ -63,7 +65,7 @@
                 <ec:column property="buildAgentUrl" title="distributedBuild.table.buildAgentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <s:url id="cancelUrl" action="cancelDistributedBuild" namespace="/">
-                    <s:param name="buildAgentUrl"><c:out value="${pageScope.currentBuild.buildAgentUrl}"/></s:param>
+                    <s:param name="buildAgentUrl" value="#attr.currentBuild.buildAgentUrl"/>
                   </s:url>
                   <redback:ifAuthorized permission="continuum-manage-queues">
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
@@ -74,10 +76,10 @@
                 </ec:column>
               </ec:row>
             </ec:table>
-          </c:if>
-          <c:if test="${empty currentDistributedBuilds}">
+          </s:if>
+          <s:else>
             <s:text name="distributedBuilds.no.currentTasks"/>
-          </c:if>
+          </s:else>
         </div>
       
       <s:form id="removeBuildForm" action="removeDistributedBuildEntries" method="post" theme="simple">
@@ -85,7 +87,7 @@
           <h3>
             <s:text name="distributedBuilds.buildQueue.section.title"/>
           </h3>
-          <c:if test="${not empty distributedBuildQueues}">
+          <s:if test="distributedBuildQueues.size() > 0">
             <s:set name="distributedBuildQueues" value="distributedBuildQueues" scope="request"/>
             <ec:table items="distributedBuildQueues"
                       autoIncludeParameters="false"
@@ -103,9 +105,9 @@
                 </redback:ifAuthorized>
                 <ec:column property="projectUrl" title="distributedBuild.table.projectName">
                   <s:url id="viewUrl" action="buildResults">
-                    <s:param name="projectId"><c:out value="${pageScope.buildQueue.projectId}"/></s:param>
+                    <s:param name="projectId" value="#attr.buildQueue.projectId"/>
                   </s:url>
-                  <s:a href="%{viewUrl}"><c:out value="${pageScope.buildQueue.projectName}"/></s:a>
+                  <s:a href="%{viewUrl}"><s:property value="#attr.buildQueue.projectName"/></s:a>
                 </ec:column>
                 <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
                 <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
@@ -114,9 +116,9 @@
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
                     <s:url id="cancelUrl" action="removeDistributedBuildEntry" namespace="/">
-                      <s:param name="projectId"><c:out value="${pageScope.buildQueue.projectId}"/></s:param>
-                      <s:param name="buildDefinitionId"><c:out value="${pageScope.buildQueue.buildDefinitionId}"/></s:param>
-                      <s:param name="buildAgentUrl"><c:out value="${pageScope.buildQueue.buildAgentUrl}"/></s:param>
+                      <s:param name="projectId" value="#attr.buildQueue.projectId"/>
+                      <s:param name="buildDefinitionId" value="#attr.buildQueue.buildDefinitionId"/>
+                      <s:param name="buildAgentUrl" value="#attr.buildQueue.buildAgentUrl"/>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                   </redback:ifAuthorized>
@@ -126,9 +128,9 @@
                 </ec:column>
               </ec:row>
             </ec:table>
-          </c:if>
+          </s:if>
         </div>
-        <c:if test="${not empty distributedBuildQueues}">
+        <s:if test="distributedBuildQueues.size() > 0">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -140,15 +142,15 @@
               </tbody>
             </table>
           </div>
-        </c:if>
-        <c:if test="${empty distributedBuildQueues}">
+        </s:if>
+        <s:else>
           <s:text name="distributedBuilds.empty"/>
-        </c:if>
+        </s:else>
       </s:form>
       
         <div id="h3">
           <h3><s:text name="distributedBuilds.currentPrepareBuild.section.title"/></h3>
-          <c:if test="${not empty currentDistributedPrepareBuilds}">
+          <s:if test="currentDistributedPrepareBuilds.size() > 0">
             <s:set name="currentDistributedPrepareBuilds" value="currentDistributedPrepareBuilds" scope="request"/>
             <ec:table items="currentDistributedPrepareBuilds"
                       var="currentPrepareBuild"
@@ -161,18 +163,18 @@
               <ec:row>
                 <ec:column property="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
                   <s:url id="viewUrl" action="projectGroupSummary">
-                    <s:param name="projectGroupId"><c:out value="${pageScope.currentPrepareBuild.projectGroupId}"/></s:param>
+                    <s:param name="projectGroupId" value="#attr.currentPrepareBuild.projectGroupId"/>
                   </s:url>
-                  <s:a href="%{viewUrl}"><c:out value="${pageScope.currentPrepareBuild.projectGroupName}"/></s:a>
+                  <s:a href="%{viewUrl}"><s:property value="#attr.currentPrepareBuild.projectGroupName"/></s:a>
                 </ec:column>
                 <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
                 <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.buildAgentUrl"/>
               </ec:row>
             </ec:table>
-          </c:if>
-          <c:if test="${empty currentDistributedPrepareBuilds}">
+          </s:if>
+          <s:else>
             <s:text name="distributedPrepareBuilds.no.currentTasks"/>
-          </c:if>
+          </s:else>
         </div>
       
       
@@ -181,7 +183,7 @@
           <h3>
             <s:text name="distributedBuilds.prepareBuildQueue.section.title"/>
           </h3>
-          <c:if test="${not empty distributedPrepareBuildQueues}">
+          <s:if test="distributedPrepareBuildQueues.size() > 0">
             <s:set name="distributedPrepareBuildQueues" value="distributedPrepareBuildQueues" scope="request"/>
             <ec:table items="distributedPrepareBuildQueues"
                       var="prepareBuildQueue"
@@ -199,18 +201,18 @@
                 </redback:ifAuthorized>
                 <ec:column property="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
                   <s:url id="viewUrl" action="projectGroupSummary">
-                    <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
+                    <s:param name="projectGroupId" value="#attr.prepareBuildQueue.projectGroupId"/>
                   </s:url>
-                  <s:a href="%{viewUrl}"><c:out value="${pageScope.prepareBuildQueue.projectGroupName}"/></s:a>
+                  <s:a href="%{viewUrl}"><s:property value="#attr.prepareBuildQueue.projectGroupName"/></s:a>
                 </ec:column>
                 <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
                 <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.buildAgentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
                     <s:url id="cancelUrl" action="removeDistributedPrepareBuildEntry" namespace="/">
-                      <s:param name="projectGroupId"><c:out value="${pageScope.prepareBuildQueue.projectGroupId}"/></s:param>
-                      <s:param name="scmRootId"><c:out value="${pageScope.prepareBuildQueue.scmRootId}"/></s:param>
-                      <s:param name="buildAgentUrl"><c:out value="${pageScope.prepareBuildQueue.buildAgentUrl}"/></s:param>
+                      <s:param name="projectGroupId" value="#attr.prepareBuildQueue.projectGroupId"/>
+                      <s:param name="scmRootId" value="#attr.prepareBuildQueue.scmRootId"/>
+                      <s:param name="buildAgentUrl" value="#attr.prepareBuildQueue.buildAgentUrl"/>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                   </redback:ifAuthorized>
@@ -220,9 +222,9 @@
                 </ec:column>
               </ec:row>
             </ec:table>
-          </c:if>
+          </s:if>
         </div>
-        <c:if test="${not empty distributedPrepareBuildQueues}">
+        <s:if test="distributedPrepareBuildQueues.size() > 0">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -234,10 +236,10 @@
               </tbody>
             </table>
           </div>
-        </c:if>
-        <c:if test="${empty distributedPrepareBuildQueues}">
+        </s:if>
+        <s:else>
           <s:text name="distributedPrepareBuilds.empty"/>
-        </c:if>
+        </s:else>
       </s:form>
       
     </body>