diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 8ec1e882..d7712942 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -34,6 +34,7 @@ $aGlobal = array(
   'blockexplorer' => $config['blockexplorer'],
   'chaininfo' => $config['chaininfo'],
   'config' => array(
+    'targetdiff' => $config['difficulty'],
     'currency' => $config['currency'],
     'txfee' => $config['txfee'],
     'payout_system' => $config['payout_system'],
diff --git a/public/templates/mmcFE/statistics/blocks/blocks_found.tpl b/public/templates/mmcFE/statistics/blocks/blocks_found.tpl
index 2278fb3c..d66e1349 100644
--- a/public/templates/mmcFE/statistics/blocks/blocks_found.tpl
+++ b/public/templates/mmcFE/statistics/blocks/blocks_found.tpl
@@ -23,8 +23,8 @@
           <font color="red">Orphan</font>
         {else}{$GLOBAL.confirmations - $BLOCKSFOUND[block].confirmations} left{/if}</td>
         <td>{$BLOCKSFOUND[block].finder|default:"unknown"}</td>
-        <td class="center">{$BLOCKSFOUND[block].time|date_format:"%d/%m/%Y %H:%M:%S"}</td>
-        <td class="right">{$BLOCKSFOUND[block].difficulty|number_format:"8"}</td>
+        <td class="center">{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}</td>
+        <td class="right">{$BLOCKSFOUND[block].difficulty|number_format:"2"}</td>
         <td class="right">{$BLOCKSFOUND[block].shares|number_format}</td>
       </tr>
 {/section}
diff --git a/public/templates/mmcFE/statistics/pool/authenticated.tpl b/public/templates/mmcFE/statistics/pool/authenticated.tpl
index 5d21e3eb..bedd8d4b 100644
--- a/public/templates/mmcFE/statistics/pool/authenticated.tpl
+++ b/public/templates/mmcFE/statistics/pool/authenticated.tpl
@@ -33,7 +33,7 @@
     </tr>
     <tr>
       <td class="leftheader">Est. Avg. Shares per Round</td>
-      <td>{($ESTTIME * $GLOBAL.sharerate)|number_format:"0"}</td>
+      <td>{(pow(2, 32 - $GLOBAL.config.targetdiff) * $DIFFICULTY)|number_format:"0"}</td>
     </tr>
     <tr>
       <td class="leftheader">Time Since Last Block</td>
diff --git a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl
index 67c8f5d7..9086427a 100644
--- a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl
+++ b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl
@@ -7,7 +7,7 @@
         <th align="left" scope="col">User Name</th>
         <th class="right" scope="col">KH/s</th>
         <th class="right">{$GLOBAL.config.currency}/Day</th>
-        <th class="right">Usd/Day</th>
+        <th class="right">USD/Day</th>
       </tr>
     </thead>
     <tbody>
@@ -20,7 +20,7 @@
         <td>{$CONTRIBHASHES[contrib].account}</td>
         <td class="right">{$CONTRIBHASHES[contrib].hashrate|number_format}</td>
         <td class="right">{$estday|number_format:"3"}</td>
-        <td class="right">{$estday|number_format:"3"*$GLOBAL.price|default:"n/a"|number_format:"4"}</td>
+        <td class="right">{($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"}</td>
       </tr>
 {/section}
 {if $listed != 1}
@@ -29,7 +29,7 @@
         <td>{$GLOBAL.userdata.username}</td>
         <td class="right">{$GLOBAL.userdata.hashrate}</td>
         <td class="right">{$estday|number_format:"3"}</td>
-        <td class="right">{$estday|number_format:"3"*$GLOBAL.price|default:"n/a"|number_format:"4"}</td>
+        <td class="right">{($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"}</td>
       </tr>
 {/if}
     </tbody>