diff --git a/public/templates/test/dashboard/default_pplns.tpl b/public/templates/test/dashboard/default_pplns.tpl
index 88641e19..d4249542 100644
--- a/public/templates/test/dashboard/default_pplns.tpl
+++ b/public/templates/test/dashboard/default_pplns.tpl
@@ -18,17 +18,6 @@
            <td><b>Share Rate</b></td>
            <td class="right">{$GLOBAL.userdata.sharerate|number_format:"2"} S/s</td>
          </tr>
-         <tr>
-           <td colspan="2"><b><u>Unpaid Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares between the last 120 confirms block until now.'></span></td>
-         </tr>
-         <tr>
-           <td><b>Your Valid<b></td>
-           <td class="right"><i>{$GLOBAL.userdata.shares.valid|number_format}</i><font size='1px'></font></b></td>
-         </tr>
-         <tr>
-           <td><b>Pool Valid</td>
-           <td class="right"><i>{$GLOBAL.roundshares.valid|number_format}</i> <font size='1px'></font></b></td>
-         </tr>
          <tr>
            <td colspan="2"><b><u>Round Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares since last found block (ie. round shares)'></span></td>
          </tr>
@@ -36,6 +25,10 @@
            <td><b>Pool Valid</b></td>
            <td class="right"><i>{$GLOBAL.roundshares.valid|number_format}</i></td>
          </tr>
+         <tr>
+           <td><b>Your Valid<b></td>
+           <td class="right"><i>{$GLOBAL.userdata.shares.valid|number_format}</i><font size='1px'></font></b></td>
+         </tr>
          <tr>
            <td><b>Pool Invalid</b></td>
            <td class="right"><i>{$GLOBAL.roundshares.invalid|number_format}</i>{if $GLOBAL.roundshares.valid > 0}<font size='1px'> ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%)</font>{/if}</td>
diff --git a/public/templates/test/dashboard/default_prop.tpl b/public/templates/test/dashboard/default_prop.tpl
index 9747ba9d..aff7a0a8 100644
--- a/public/templates/test/dashboard/default_prop.tpl
+++ b/public/templates/test/dashboard/default_prop.tpl
@@ -14,17 +14,6 @@
            <td><b>Share Rate</b></td>
            <td class="right">{$GLOBAL.userdata.sharerate|number_format:"2"} S/s</td>
          </tr>
-         <tr>
-           <td colspan="2"><b><u>Unpaid Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares between the last 120 confirms block until now.'></span></td>
-         </tr>
-         <tr>
-           <td><b>Your Valid<b></td>
-           <td class="right"><i>{$GLOBAL.userdata.shares.valid|number_format}</i><font size='1px'></font></b></td>
-         </tr>
-         <tr>
-           <td><b>Pool Valid</td>
-           <td class="right"><i>{$GLOBAL.roundshares.valid|number_format}</i> <font size='1px'></font></b></td>
-         </tr>
          <tr>
            <td colspan="2"><b><u>Round Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares since last found block (ie. round shares)'></span></td>
          </tr>
@@ -32,6 +21,10 @@
            <td><b>Pool Valid</b></td>
            <td class="right"><i>{$GLOBAL.roundshares.valid|number_format}</i></td>
          </tr>
+         <tr>
+           <td><b>Your Valid<b></td>
+           <td class="right"><i>{$GLOBAL.userdata.shares.valid|number_format}</i><font size='1px'></font></b></td>
+         </tr>
          <tr>
            <td><b>Pool Invalid</b></td>
            <td class="right"><i>{$GLOBAL.roundshares.invalid|number_format}</i>{if $GLOBAL.roundshares.valid > 0}<font size='1px'> ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%)</font>{/if}</td>