diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css
index 1739d8cb..96422900 100644
--- a/public/site_assets/bootstrap/css/mpos.css
+++ b/public/site_assets/bootstrap/css/mpos.css
@@ -409,3 +409,61 @@ span.spark-18 {
 span.spark-25 {
   margin: -25%;
 }
+
+/* Test Edit */
+
+.circle-tile {
+  margin-bottom: 30px;
+}
+
+.circle-tile {
+  margin-bottom: 15px;
+  text-align: center;
+}
+
+.circle-tile-content {
+  padding-top: 50px;
+  border-radius: 8px;
+  border: 3px solid rgba(255, 255, 255, 0.3);
+}
+
+.circle-tile-description {
+  font-weight: bold;
+  font-size: 16px;
+}
+
+.circle-tile-number {
+  padding: 0px 1px 4px;
+}
+
+.circle-tile-heading {
+  position: relative;
+  width: 80px;
+  height: 80px;
+  margin: 0px auto -40px;
+  border: 3px solid rgba(255, 255, 255, 0.3);
+  border-radius: 100%;
+  color: #FFF;
+  transition: all 0.3s ease-in-out 0s;
+}
+
+.circle-tile-heading .fa {
+  line-height: 80px;
+}
+
+.blue {
+  background-color: #428BCA;
+}
+
+.text-faded {
+  color: rgba(255, 255, 255, 0.7);
+}
+
+p.up {
+  margin: -14px 0px 0px 0px;
+}
+
+div.up {
+  margin: -10px 0px 6px 0px;
+}
+/* End Test */
diff --git a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl
index cda1bc1c..accaceab 100644
--- a/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl
+++ b/public/templates/bootstrap/dashboard/overview/_with_price_graph.tpl
@@ -1,37 +1,103 @@
-          <div class="col-md-spark">
-              <p class="overview">My Hashrate</p>
+          <div class="col-lg-2 col-sm-6">
+            <div class="circle-tile">
+            <div class="circle-tile-heading blue">
+            <i class="fa fa-sitemap fa-fw fa-3x"></i>
+            </div>
+            <div class="circle-tile-content blue">
+            <div class="circle-tile-description text-faded">
+              <p>My Hashrate</p>
+            <div class="circle-tile-number text-faded up">
               <span class="overview" id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</span><span class="overview-mhs"> {$GLOBAL.hashunits.personal}</span>
               <br>
               <span class="personal-hashrate-bar spark-18"></span>
+            </div>
+            </div>
+            </div>
+            </div>
           </div>
-          <div class="col-md-spark">
-              <p class="overview">My Sharerate</p>
-              <span class="overview" id="b-sharerate">{$GLOBAL.userdata.sharerate|number_format:"2"}</span><span class="overview-mhs"> S/s</span>
-              <br>
-              <span class="personal-sharerate-bar spark-18"></span>
-          </div>
-          <div class="col-md-spark">
-              <p class="overview">Pool Hashrate</p>
+          <div class="col-lg-2 col-sm-6">
+            <div class="circle-tile">
+            <div class="circle-tile-heading blue">
+            <i class="fa fa-sitemap fa-fw fa-3x"></i>
+            </div>
+            <div class="circle-tile-content blue">
+            <div class="circle-tile-description text-faded">
+              <p>Pool Hashrate</p>
+            </div>
+            <div class="circle-tile-number text-faded up">
               <span class="overview" id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</span><span class="overview-mhs"> {$GLOBAL.hashunits.pool}</span>
               <br>
               <span class="pool-hashrate-bar spark-18"></span>
+            </div>
+            </div>
+            </div>
           </div>
-          <div class="col-md-spark">
-              <p class="overview">Pool Workers</p>
+          <div class="col-lg-2 col-sm-6">
+            <div class="circle-tile">
+            <div class="circle-tile-heading blue">
+            <i class="fa fa-sitemap fa-fw fa-3x"></i>
+            </div>
+            <div class="circle-tile-content blue">
+            <div class="circle-tile-description text-faded">
+              <p>My Sharerate</p>
+            </div>
+            <div class="circle-tile-number text-faded up">
+              <span class="overview" id="b-sharerate">{$GLOBAL.userdata.sharerate|number_format:"2"}</span><span class="overview-mhs"> S/s</span>
+              <br>
+              <span class="personal-sharerate-bar spark-18"></span>
+            </div>
+            </div>
+            </div>
+          </div>
+          <div class="col-lg-2 col-sm-6">
+            <div class="circle-tile">
+            <div class="circle-tile-heading blue">
+            <i class="fa fa-sitemap fa-fw fa-3x"></i>
+            </div>
+            <div class="circle-tile-content blue">
+            <div class="circle-tile-description text-faded">
+              <p>Pool Workers</p>
+            </div>
+            <div class="circle-tile-number text-faded up">
               <span class="overview" id="b-poolworkers">{$GLOBAL.workers}</span>
               <br>
               <span class="pool-workers-bar spark-18"></span>
+            </div>
+            </div>
+            </div>
           </div>
-          <div class="col-md-spark">
-              <p class="overview">Net Hashrate</p>
+          <div class="col-lg-2 col-sm-6">
+            <div class="circle-tile">
+            <div class="circle-tile-heading blue">
+            <i class="fa fa-sitemap fa-fw fa-3x"></i>
+            </div>
+            <div class="circle-tile-content blue">
+            <div class="circle-tile-description text-faded">
+              <p>Net Hashrate</p>
+            </div>
+            <div class="circle-tile-number text-faded up">
               <span class="overview" id="b-nethashrate">{$GLOBAL.nethashrate|number_format:"2"}</span><span class="overview-mhs"> {$GLOBAL.hashunits.network}</span>
               <br>
               <span class="pool-nethashrate-bar spark-18"></span>
+            </div>
+            </div>
+            </div>
           </div>
-          <div class="col-md-spark">
-              <p class="overview">{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}</p>
-              <span class="overview spark-25" id="b-price">{$GLOBAL.price|default:"0"|number_format:"8"}</span>
+          <div class="col-lg-2 col-sm-6">
+            <div class="circle-tile">
+            <div class="circle-tile-heading blue">
+            <i class="fa fa-sitemap fa-fw fa-3x"></i>
+            </div>
+            <div class="circle-tile-content blue">
+            <div class="circle-tile-description text-faded">
+              <p>{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}</p>
+            </div>
+            <div class="circle-tile-number text-faded up">
+              <span class="overview" id="b-price">{$GLOBAL.price|default:"0"|number_format:"8"}</span>
               <br>
               <span class="coin-price-line spark-25"></span>
+            </div>
+            </div>
+            </div>
           </div>
 
diff --git a/public/templates/bootstrap/dashboard/overview/default.tpl b/public/templates/bootstrap/dashboard/overview/default.tpl
index de533cc7..94652aad 100644
--- a/public/templates/bootstrap/dashboard/overview/default.tpl
+++ b/public/templates/bootstrap/dashboard/overview/default.tpl
@@ -6,7 +6,7 @@
         </h4>
       </div>
       <div class="panel-footer">
-       <div class="row show-grid">
+       <div class="row">
           {* Depending on the price option we need to load a different template so it aligns properly *}
           {if $GLOBAL.config.price.enabled}
           {include file="dashboard/overview/_with_price_graph.tpl"}
diff --git a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl
index 354f3925..bb49912e 100644
--- a/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl
+++ b/public/templates/bootstrap/statistics/pool/contributors_hashrate.tpl
@@ -22,7 +22,7 @@
 {assign var=listed value=0}
 {section contrib $CONTRIBHASHES}
       {math assign="estday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$CONTRIBHASHES[contrib].hashrate}
-            <tr{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1} style="background-color:#99EB99;"{else}{/if}>
+            {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1}<tr id="test">{else}<tr>{/if}
               <td>{$rank++}</td>
               <td>{if $CONTRIBHASHES[contrib].donate_percent|default:"0" >= 2}<i class="fa fa-trophy fa-fw">{elseif $CONTRIBHASHES[contrib].donate_percent|default:"0" < 2 AND $CONTRIBHASHES[contrib].donate_percent|default:"0" > 0}<i class="fa fa-star-o fa-fw">{else}<i class="fa fa-ban fa-fw"></i>{/if}</td>
               <td>{if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if}</td>
@@ -35,7 +35,7 @@
 {/section}
 {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.rawhashrate|default:"0" > 0}
       {math assign="myestday" equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24), 3)" diff=$DIFFICULTY reward=$REWARD hashrate=$GLOBAL.userdata.rawhashrate}
-            <tr>
+            <tr{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1} style="color:#99EB99;"{else}{/if}>
               <td>n/a</td>
               <td>{if $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="fa fa-trophy fa-fw"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}<i class="fa fa-star-o fa-fw"></i>{else}<i class="fa fa-ban fa-fw"></i>{/if}</td>
               <td>{$GLOBAL.userdata.username|escape}</td>
diff --git a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl
index e2c9432f..06661e03 100644
--- a/public/templates/bootstrap/statistics/pool/contributors_shares.tpl
+++ b/public/templates/bootstrap/statistics/pool/contributors_shares.tpl
@@ -17,7 +17,7 @@
 {assign var=rank value=1}
 {assign var=listed value=0}
 {section shares $CONTRIBSHARES}
-            <tr{if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1} style="background-color:#99EB99;"{else}{/if}>
+            {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBSHARES[shares].account|lower}{assign var=listed value=1}<tr class"info">{else}<tr>{/if}
               <td>{$rank++}</td>
               <td>{if $CONTRIBSHARES[shares].donate_percent|default:"0" >= 2}<i class="fa fa-trophy fa-fw">{else if $CONTRIBSHARES[shares].donate_percent|default:"0" < 2 AND $CONTRIBSHARES[shares].donate_percent|default:"0" > 0}<i class="fa fa-star-o fa-fw">{else}<i class="fa fa-ban fa-fw"></i>{/if}</td>
               <td>{if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if}</td>
@@ -25,7 +25,7 @@
             </tr>
 {/section}
 {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.shares.valid|default:"0" > 0}
-            <tr>
+            <tr {if $GLOBAL.userdata.username|default:""|lower == $CONTRIBHASHES[contrib].account|lower}{assign var=listed value=1} style="color:#99EB99;"{else}{/if}>
               <td>n/a</td>
               <td>{if $GLOBAL.userdata.donate_percent|default:"0" >= 2}<i class="fa fa-trophy fa-fw"></i>{elseif $GLOBAL.userdata.donate_percent|default:"0" < 2 AND $GLOBAL.userdata.donate_percent|default:"0" > 0}<i class="fa fa-star-o fa-fw"></i>{else}<i class="fa fa-ban fa-fw"></i>{/if}</td>
               <td>{$GLOBAL.userdata.username|escape}</td>