--- results.orig	2008-08-13 15:46:47.000000000 +0100
+++ results.jsp	2008-08-08 17:16:45.000000000 +0100
@@ -210,7 +210,18 @@
     </c:when>
 
     <c:when test="${!empty resultSet.graphs}"> 
+	<c:choose>
+    		<c:when test="${!empty param.cols}"> 
+		<c:set var="cols" scope="page" value="${param.cols}"/>
+		</c:when>
+		<c:otherwise>
+		<c:set var="cols" scope="page" value="2"/>
+		</c:otherwise>
+	</c:choose>
+      <c:set var="i" scope="page" value="0"/>
+      <table style='border-collapse: collapse; border-spacing: 5px; width: 90%: border: 0px'>
       <c:forEach var="graph" items="${resultSet.graphs}">
+        <c:if test='${i == "0"}'><tr></c:if>
         <c:url var="zoomUrl" value="${requestScope.relativeRequestPath}">
           <c:param name="zoom" value="true"/>
           <c:param name="relativetime" value="custom"/>
@@ -227,9 +238,16 @@
           <c:param name="end" value="${results.end.time}"/>
 		</c:url>
 		
-	    <a href="${zoomUrl}"><img src="${graphUrl}" alt="Resource graph: ${graph.title} (click to zoom)" /></a>
-		<br/>
+          <td><a href="${zoomUrl}"><img src="${graphUrl}" alt="Resource graph: ${graph.title} (click to zoom)" /></a><br/></td>
+          <c:if test='${i < cols}'>
+             <c:set var="i" scope="page" value="${i + 1}"/>
+          </c:if>
+          <c:if test='${i == cols}'>
+             <c:set var="i" scope="page" value="0"/>
+             </tr>
+           </c:if>
       </c:forEach>
+      </table>
     </c:when>
 
     <c:otherwise>