diff --git a/public/site_assets/bootstrap/js/custom.js b/public/site_assets/bootstrap/js/custom.js
old mode 100644
new mode 100755
index 8f7fa587..e69de29b
--- a/public/site_assets/bootstrap/js/custom.js
+++ b/public/site_assets/bootstrap/js/custom.js
@@ -1,55 +0,0 @@
-$(document).ready(function() {
-  $(".tablesorter").tablesorter();
-  $(".tablesorterpager").tablesorter().tablesorterPager({positionFixed: false, container: $("#pager"), cssNext: ".icon-forward", cssPrev: ".icon-backward", cssFirst: ".icon-fast-backward", cssLast: ".icon-fast-forward"});
-  $(".tab_content").hide(); //Hide all content
-  $("ul.tabs li:first").addClass("active").show(); //Activate first tab
-  $(".tab_content:first").show(); //Show first tab content
-  $("ul.tabs li").click(function() {
-    $("ul.tabs li").removeClass("active"); //Remove any "active" class
-    $(this).addClass("active"); //Add "active" class to selected tab
-    $(".tab_content").hide(); //Hide all tab content
-    var activeTab = $(this).find("a").attr("href"); //Find the href attribute value to identify the active tab + content
-    $(activeTab).fadeIn(); //Fade in the active ID content
-    $(activeTab).find('.visualize').trigger('visualizeRefresh');
-    return false;
-  });
-  $('table.visualize').each(function () {
-    if ($(this).attr('rel')) {
-      var statsType = $(this).attr('rel');
-    } else {
-      var statsType = 'area';
-    }
-
-    // hack to statically set width as something is broken with div width calculation - anni
-    var chart_width = $(document).width() - 500;
-
-    if (statsType == 'line' || statsType == 'pie') {
-      $(this).hide().visualize({
-        type: statsType,
-        // 'bar', 'area', 'pie', 'line'
-        width: chart_width,
-        height: '240px',
-        colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c'],
-        lineDots: 'double',
-        interaction: true,
-        multiHover: 5,
-        tooltip: true,
-        tooltiphtml: function (data) {
-          var html = ''; 
-          for (var i = 0; i < data.point.length; i++) {
-            html += '<p class="chart_tooltip"><strong>' + data.point[i].value + '</strong> ' + data.point[i].yLabels[0] + '</p>';
-          }
-          return html;
-        }
-      });
-    } else {
-      $(this).hide().visualize({
-        // 'bar', 'area', 'pie', 'line'
-        width: chart_width,
-        type: statsType,
-        height: '240px',
-        colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c']
-      });
-    }
-  });
-});
diff --git a/public/templates/bootstrap/dashboard/account_data.tpl b/public/templates/bootstrap/dashboard/account_data.tpl
index bd1d5eae..1ee39bdd 100755
--- a/public/templates/bootstrap/dashboard/account_data.tpl
+++ b/public/templates/bootstrap/dashboard/account_data.tpl
@@ -4,7 +4,7 @@
       <h4 class="panel-title">Account Information</h4>
     </div>
     <div class="panel-body">
-    <table class="tablesorter" cellspacing="0">
+    <table class="table table-bordered table-hover table-striped">
       <tr>
         <td colspan="2">
 {if $GLOBAL.userdata.no_fees}
@@ -22,7 +22,7 @@
         </td>
       </tr>
     </table>
-    <table class="tablesorter" cellspacing="0">
+    <table class="table table-bordered table-hover table-striped">
       <thead>
         <tr><th colspan="2"><b>{$GLOBAL.config.currency} Account Balance</b></th></tr>
       </thead>
diff --git a/public/templates/bootstrap/dashboard/js_static.tpl b/public/templates/bootstrap/dashboard/js_static.tpl
old mode 100644
new mode 100755
diff --git a/public/templates/bootstrap/dashboard/round_data.tpl b/public/templates/bootstrap/dashboard/round_data.tpl
index ea39dcc4..62a2d8fd 100755
--- a/public/templates/bootstrap/dashboard/round_data.tpl
+++ b/public/templates/bootstrap/dashboard/round_data.tpl
@@ -4,7 +4,8 @@
       <h4 class="panel-title">Round Information</h4>
     </div>
     <div class="panel-body">
-      <!--INSERT SHARES PIE CHART HERE-->
+      <div class="flot" id="personalround"></div>
+      <div class="flot" id="poolround"></div>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/public/templates/bootstrap/dashboard/system_stats.tpl b/public/templates/bootstrap/dashboard/system_stats.tpl
index f6ffdc62..c14d4874 100755
--- a/public/templates/bootstrap/dashboard/system_stats.tpl
+++ b/public/templates/bootstrap/dashboard/system_stats.tpl
@@ -4,7 +4,7 @@
       <h4 class="panel-title">{$GLOBAL.config.payout_system|capitalize} Stats</h4>
     </div>
     <div class="panel-body">
-      <table class="tablesorter" cellspacing="0">
+      <table class="table table-bordered table-hover table-striped">
        <tbody>
 {if $GLOBAL.config.payout_system == 'pplns'}
          <tr>
@@ -29,18 +29,11 @@
           <td id="b-ppsdiff">{$GLOBAL.userdata.sharedifficulty|number_format:"2"}</td>
         </tr>
 {/if}
-         <tr><td colspan="2">&nbsp;</td></tr>
          {include file="dashboard/round_shares.tpl"}
-         <tr><td colspan="2">&nbsp;</td></tr>
          {include file="dashboard/payout_estimates.tpl"}
-         <tr><td colspan="2">&nbsp;</td></tr>
          {include file="dashboard/network_info.tpl"}
-         <tr><td colspan="2">&nbsp;</td></tr>
        </tbody>
       </table>
     </div>
-    <div class="panel-footer">
-      Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.
-    </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/public/templates/bootstrap/master.tpl b/public/templates/bootstrap/master.tpl
old mode 100644
new mode 100755
index 39472b60..60bcc559
--- a/public/templates/bootstrap/master.tpl
+++ b/public/templates/bootstrap/master.tpl
@@ -37,16 +37,10 @@
     {if $GLOBAL.statistics.analytics.enabled}
       {$GLOBAL.statistics.analytics.code nofilter}
     {/if}
-
-    <!-- Core CSS - Include with every page -->
     <link href="{$PATH}/css/bootstrap.min.css" rel="stylesheet">
     <link href="{$PATH}/font-awesome/css/font-awesome.css" rel="stylesheet">
-
-    <!-- Page-Level Plugin CSS - Dashboard -->
     <link href="{$PATH}/css/plugins/morris/morris-0.4.3.min.css" rel="stylesheet">
     <link href="{$PATH}/css/plugins/timeline/timeline.css" rel="stylesheet">
-
-    <!-- MPOS CSS - Include with every page -->
     <link href="{$PATH}/css/mpos.css" rel="stylesheet">
     
 </head>
@@ -73,32 +67,19 @@
         {/if}
       {/if}
       </div>
-      <!-- /#page-wrapper -->
-
     </div>
-    <!-- /#wrapper -->
 
-    <!-- Core Scripts - Include with every page -->
     <script src="{$PATH}/js/jquery-1.10.2.js"></script>
     <script src="{$PATH}/js/bootstrap.min.js"></script>
     <script src="{$PATH}/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-
-    <!-- Page-Level Plugin Scripts - Flot -->
     <!--[if lte IE 8]><script src="js/excanvas.min.js"></script><![endif]-->
     <script src="{$PATH}/js/plugins/flot/jquery.flot.js"></script>
     <script src="{$PATH}/js/plugins/flot/jquery.flot.tooltip.min.js"></script>
     <script src="{$PATH}/js/plugins/flot/jquery.flot.resize.js"></script>
     <script src="{$PATH}/js/plugins/flot/jquery.flot.pie.js"></script>
-    
-    <!-- Page-Level Plugin Scripts - Dashboard -->
     <script src="{$PATH}/js/plugins/morris/raphael-2.1.0.min.js"></script>
-    <script src="{$PATH}/js/plugins/morris/morris.js"></script>
-
-    <!-- MPOS Scripts - Include with every page -->
     <script src="{$PATH}/js/mpos.js"></script>
-
-    <!-- Page-Level Demo Scripts - Dashboard - Use for reference -->
-    <script src="{$PATH}/js/demo/dashboard-demo.js"></script>
+  <script type="text/javascript" src="{$PATH}/js/justgage.1.0.1.min.js"></script>
 
 </body>
 </html>