diff --git a/hyracks-control-cc/src/main/resources/edu/uci/ics/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html b/hyracks-control-cc/src/main/resources/edu/uci/ics/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
index e7ac25a..df3350d 100644
--- a/hyracks-control-cc/src/main/resources/edu/uci/ics/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
+++ b/hyracks-control-cc/src/main/resources/edu/uci/ics/hyracks/control/cc/adminconsole/pages/JobDetailsPage.html
@@ -6,7 +6,7 @@
     <div id="job-run" wicket:id="job-run" style="display: none;">
     </div>
     <div wicket:id="job-timeline" style="overflow: auto;"></div>
-    <div id="job-graph"></div>
+    <div id="job-graph" style="position:relative"></div>
 
     <script src="/static/javascript/adminconsole/Graphs.js" type="text/javascript"></script>
     <script src="/static/javascript/adminconsole/JobDetailsPage.js" type="text/javascript"></script>
diff --git a/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/Graphs.js b/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/Graphs.js
index bc3b95b..dcba9c0 100644
--- a/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/Graphs.js
+++ b/hyracks-control-cc/src/main/resources/static/javascript/adminconsole/Graphs.js
@@ -126,7 +126,20 @@
 Graphs.JsPlumbRenderer = function(dag, element, options) {
     this.dag = dag;
     this.element = element;
-    this.options = options;
+    this.options = options || {
+        levelStep : 100
+    };
+}
+
+Graphs.JsPlumbRenderer.prototype.configureDiv = function(div, node, stratum, inStratumIndex, stratumWidth) {
+    div.id = node.key;
+    div.dagNode = node;
+    /*
+     * div.style.position = 'absolute'; div.style.left = (stratum *
+     * this.options.levelStep) + 'px'; div.style.top = (inStratumIndex * 100) +
+     * 'px'; div.style.width = '50px'; div.style.height = '50px';
+     * div.style.border = 'thick solid #000000';
+     */
 }
 
 Graphs.JsPlumbRenderer.prototype.refresh = function() {
@@ -140,8 +153,7 @@
         for ( var j = 0; j < stratumList.length; ++j) {
             var node = stratumList[j];
             var div = document.createElement('div');
-            div.id = node.key;
-            div.dagNode = node;
+            this.configureDiv(div, node, i, j, stratumList.length);
             this.element.appendChild(div);
         }
     }
