diff --git a/public/templates/test/dashboard/default.tpl b/public/templates/test/dashboard/default.tpl
index f6d2adeb..fdc85020 100644
--- a/public/templates/test/dashboard/default.tpl
+++ b/public/templates/test/dashboard/default.tpl
@@ -1,7 +1,6 @@
 {if $smarty.session.AUTHENTICATED|default}
   {assign var=payout_system value=$GLOBAL.config.payout_system}
-  {include file="dashboard/graph.tpl"}
+  {include file="dashboard/overview.tpl"}
   {include file="dashboard/default_$payout_system.tpl"}
-  {include file="dashboard/gauges.tpl"}
   {include file="dashboard/js.tpl"}
 {/if}
diff --git a/public/templates/test/dashboard/gauges.tpl b/public/templates/test/dashboard/gauges.tpl
index b2e69386..5346232a 100644
--- a/public/templates/test/dashboard/gauges.tpl
+++ b/public/templates/test/dashboard/gauges.tpl
@@ -1,12 +1,16 @@
 <article class="module width_3_quarter">
   <header><h3>Gauges</h3></header>
   <div class="module_content">
-    <div style="display: inline-block; min-height: 250px;">
-      <div id="hashrate" style="width:150px; height:120px; float: left;"></div>
-      <div id="poolhashrate" style="width:150px; height:120px; float: left;"></div>
-      <div id="nethashrate" style="width:150px; height:120px; float: left;"></div>
-      <div id="sharerate" style="width:150px; height:120px; float: left;"></div>
-      <div id="querytime" style="width:150px; height:120px; float: left;"></div>
+    <div style="display: inline-block; width: 103px;">
+      <div id="poolhashrate" style="width:100px; height:80px;"></div>
+      <div id="sharerate" style="width:100px; height:80px;"></div>
+    </div>
+    <div style="display: inline-block;">
+      <div id="hashrate" style="width:200px; height:160px;"></div>
+    </div>
+    <div style="display: inline-block; width: 103px;">
+      <div id="nethashrate" style="width:100px; height:80px;"></div>
+      <div id="querytime" style="width:100px; height:80px;"></div>
     </div>
   </div>
   <footer><p style="margin-left: 25px">Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.</p></footer>
diff --git a/public/templates/test/dashboard/graph.tpl b/public/templates/test/dashboard/graph.tpl
deleted file mode 100644
index 324c212e..00000000
--- a/public/templates/test/dashboard/graph.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<article class="module width_full">
-  <header><h3>Graphs</h3></header>
-  <div class="module_content">
-	  <div id="hashrategraph" style="height:200px; width: 95%;"></div>
-  </div>
-  <footer>
-    <p style="margin-left: 25px">Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.</p>
-  </footer>
-</article>
diff --git a/public/templates/test/dashboard/js.tpl b/public/templates/test/dashboard/js.tpl
index 0008fa0b..b72529c8 100644
--- a/public/templates/test/dashboard/js.tpl
+++ b/public/templates/test/dashboard/js.tpl
@@ -24,7 +24,6 @@ $(document).ready(function(){
 
   // jqPlit defaults
   var jqPlotOptions = {
-    title: 'Overview',
     grid: { drawBorder: false, background: '#fbfbfb', shadow: false },
     stackSeries: false,
     seriesColors: [ '#26a4ed', '#ee8310', '#e9e744' ],
@@ -36,7 +35,7 @@ $(document).ready(function(){
       rendererOptions: { smooth: true }
     },
     series: [
-      { yaxid: 'yaxis', label: 'Own',    fill: true                                            },
+      { yaxis: 'yaxis', label: 'Own',    fill: true                                            },
       { yaxis: 'yaxis', label: 'Pool',   fill: false, trendline: { show: false }, lineWidth: 2, markerOptions: { show: true, size: 4 }},
       { yaxis: 'y3axis', label: 'Sharerate', fill: false, trendline: { show: false }              },
     ],
@@ -44,7 +43,7 @@ $(document).ready(function(){
     axes: {
       yaxis:  { min: 0, pad: 1.25, label: 'Hashrate' , labelRenderer: $.jqplot.CanvasAxisLabelRenderer },
       y3axis: { min: 0, pad: 1.25, label: 'Sharerate', labelRenderer: $.jqplot.CanvasAxisLabelRenderer },
-      xaxis:  { tickInterval: {/literal}{$GLOBAL.config.statistics_ajax_refresh_interval}{literal}, label: 'Time', labelRenderer: $.jqplot.CanvasAxisLabelRenderer, renderer: $.jqplot.DateAxisRenderer, angle: 30, tickOptions: { formatString: '%T' } },
+      xaxis:  { tickInterval: {/literal}{$GLOBAL.config.statistics_ajax_refresh_interval}{literal}, labelRenderer: $.jqplot.CanvasAxisLabelRenderer, renderer: $.jqplot.DateAxisRenderer, angle: 30, tickOptions: { formatString: '%T' } },
     },
   };
 
@@ -57,7 +56,7 @@ $(document).ready(function(){
     g2 = new JustGage({id: "poolhashrate", value: parseFloat(data.getdashboarddata.pool.hashrate).toFixed(2), min: 0, max: Math.round(data.getdashboarddata.pool.hashrate * 2), title: "Pool Hashrate", label: "{/literal}{$GLOBAL.hashunits.pool}{literal}"});
     g3 = new JustGage({id: "hashrate", value: parseFloat(data.getdashboarddata.personal.hashrate).toFixed(2), min: 0, max: Math.round(data.getdashboarddata.personal.hashrate * 2), title: "Hashrate", label: "{/literal}{$GLOBAL.hashunits.personal}{literal}"});
     g4 = new JustGage({id: "sharerate", value: parseFloat(data.getdashboarddata.personal.sharerate).toFixed(2), min: 0, max: Math.round(data.getdashboarddata.personal.sharerate * 2), title: "Sharerate", label: "shares/s"});
-    g5 = new JustGage({id: "sharerate", value: parseFloat(data.getdashboarddata.runtime).toFixed(2), min: 0, max: Math.round(data.getdashboarddata.runtime * 3), title: "Querytime", label: "ms"});
+    g5 = new JustGage({id: "querytime", value: parseFloat(data.getdashboarddata.runtime).toFixed(2), min: 0, max: Math.round(data.getdashboarddata.runtime * 3), title: "Querytime", label: "ms"});
   }
 
   // Helper to refresh gauges
diff --git a/public/templates/test/dashboard/overview.tpl b/public/templates/test/dashboard/overview.tpl
new file mode 100644
index 00000000..96b741e2
--- /dev/null
+++ b/public/templates/test/dashboard/overview.tpl
@@ -0,0 +1,22 @@
+<article class="module width_full">
+  <header><h3>Overview</h3></header>
+  <div class="module_content">
+    <div style="display: inline-block;">
+      <div id="poolhashrate" style="width:100px; height:80px;"></div>
+      <div id="sharerate" style="width:100px; height:80px;"></div>
+    </div>
+    <div style="display: inline-block;">
+      <div id="hashrate" style="width:200px; height:160px;"></div>
+    </div>
+    <div style="display: inline-block;">
+      <div id="nethashrate" style="width:100px; height:80px;"></div>
+      <div id="querytime" style="width:100px; height:80px;"></div>
+    </div>
+	  <div style="margin-left: 50px; display: inline-block; width: 70%;">
+      <div id="hashrategraph" style="height: 160px; width: 100%;"></div>
+    </div>
+  </div>
+  <footer>
+    <p style="margin-left: 25px">Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.</p>
+  </footer>
+</article>