diff --git a/public/templates/bootstrap/account/edit/detail.tpl b/public/templates/bootstrap/account/edit/detail.tpl
index 574f5d0b..204a9dfb 100644
--- a/public/templates/bootstrap/account/edit/detail.tpl
+++ b/public/templates/bootstrap/account/edit/detail.tpl
@@ -36,13 +36,13 @@
             </div>
             <div class="form-group">
               <label>Donation Percentage</label>
-              <font size="1"> Donation amount in percent ({$DONATE_THRESHOLD.min}-100%)</font>
+              <font size="1"> Donation amount in percent ({$DONATE_THRESHOLD.min} - 100%)</font>
               {nocache}<input class="form-control" type="text" name="donatePercent" value="{$smarty.request.donatePercent|default:$GLOBAL.userdata.donate_percent|escape|number_format:"2"}" size="4" {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}/>{/nocache}
             </div>
             <div class="form-group">
               <label>Automatic Payout Threshold</label>
               </br>
-              <font size="1">{$GLOBAL.config.ap_threshold.min}-{$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout. A {if $GLOBAL.config.txfee_auto > 0.00001}{$GLOBAL.config.txfee_auto}{else}{$GLOBAL.config.txfee_auto|number_format:"8"}{/if} {$GLOBAL.config.currency} TX fee will apply <span id="tt"><img width="15px" height="15px" title="This {if $GLOBAL.config.txfee_auto > 0.00001}{$GLOBAL.config.txfee_auto}{else}{$GLOBAL.config.txfee_auto|number_format:"8"}{/if} automatic payment transaction fee is a network fee and goes back into the network not the pool." src="site_assets/mpos/images/questionmark.png"></span></font>
+              <font size="1">{$GLOBAL.config.ap_threshold.min} - {$GLOBAL.config.ap_threshold.max} {$GLOBAL.config.currency}. Set to '0' for no auto payout. A {if $GLOBAL.config.txfee_auto > 0.00001}{$GLOBAL.config.txfee_auto}{else}{$GLOBAL.config.txfee_auto|number_format:"8"}{/if} {$GLOBAL.config.currency} TX fee will apply <span id="tt"><img width="15px" height="15px" title="This {if $GLOBAL.config.txfee_auto > 0.00001}{$GLOBAL.config.txfee_auto}{else}{$GLOBAL.config.txfee_auto|number_format:"8"}{/if} automatic payment transaction fee is a network fee and goes back into the network not the pool." src="site_assets/mpos/images/questionmark.png"></span></font>
               </br>
               <input class="form-control" type="text" name="payoutThreshold" value="{nocache}{$smarty.request.payoutThreshold|default:$GLOBAL.userdata.ap_threshold|escape}{/nocache}" size="{$GLOBAL.config.ap_threshold.max|strlen}" maxlength="{$GLOBAL.config.ap_threshold.max|strlen}" {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details && !$DETAILSUNLOCKED}id="disabledInput" disabled{/if}/>
             </div>
diff --git a/public/templates/bootstrap/dashboard/overview_no_price.tpl b/public/templates/bootstrap/dashboard/overview_no_price.tpl
index 3e735f62..1a3a5ea9 100644
--- a/public/templates/bootstrap/dashboard/overview_no_price.tpl
+++ b/public/templates/bootstrap/dashboard/overview_no_price.tpl
@@ -1,6 +1,6 @@
           <div class="col-md-spark-2">
-              <p class="overview">My Hashrate {$GLOBAL.hashunits.personal}</p>
-              <span class="overview" id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</span>
+              <p class="overview">My Hashrate</p>
+              <span class="overview" id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</span><span> {$GLOBAL.hashunits.personal}</span>
               <br>
               <span class="personal-hashrate-bar"></span>
           </div>
@@ -11,8 +11,8 @@
               <span class="personal-sharerate-bar"></span>
           </div>
           <div class="col-md-spark-2">
-              <p class="overview">Pool Hashrate {$GLOBAL.hashunits.pool}</p>
-              <span class="overview" id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</span>
+              <p class="overview">Pool Hashrate</p>
+              <span class="overview" id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</span><span> {$GLOBAL.hashunits.pool}<span>
               <br>
               <span class="pool-hashrate-bar"></span>
           </div>
@@ -23,8 +23,8 @@
               <span class="pool-workers-bar"></span>
           </div>
           <div class="col-md-spark-2">
-              <p class="overview">Net Hashrate {$GLOBAL.hashunits.pool}</p>
-              <span class="overview" id="b-nethashrate">{$GLOBAL.nethashrate|number_format:"2"}</span>
+              <p class="overview">Net Hashrate</p>
+              <span class="overview" id="b-nethashrate">{$GLOBAL.nethashrate|number_format:"2"}</span><spam> {$GLOBAL.hashunits.network}</span>
               <br>
               <span class="pool-nethashrate-bar"></span>
           </div>
diff --git a/public/templates/bootstrap/dashboard/overview_price.tpl b/public/templates/bootstrap/dashboard/overview_price.tpl
index b96c7414..837465ad 100644
--- a/public/templates/bootstrap/dashboard/overview_price.tpl
+++ b/public/templates/bootstrap/dashboard/overview_price.tpl
@@ -1,6 +1,6 @@
           <div class="col-md-spark">
-              <p class="overview">My Hashrate {$GLOBAL.hashunits.personal}</p>
-              <span class="overview" id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</span>
+              <p class="overview">My Hashrate</p>
+              <span class="overview" id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</span><span> {$GLOBAL.hashunits.personal}</span>
               <br>
               <span class="personal-hashrate-bar"></span>
           </div>
@@ -11,8 +11,8 @@
               <span class="personal-sharerate-bar"></span>
           </div>
           <div class="col-md-spark">
-              <p class="overview">Pool Hashrate {$GLOBAL.hashunits.pool}</p>
-              <span class="overview" id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</span>
+              <p class="overview">Pool Hashrate</p>
+              <span class="overview" id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</span><span> {$GLOBAL.hashunits.pool}</span>
               <br>
               <span class="pool-hashrate-bar"></span>
           </div>
@@ -23,8 +23,8 @@
               <span class="pool-workers-bar"></span>
           </div>
           <div class="col-md-spark">
-              <p class="overview">Net Hashrate {$GLOBAL.hashunits.pool}</p>
-              <span class="overview" id="b-nethashrate">{$GLOBAL.nethashrate|number_format:"2"}</span>
+              <p class="overview">Net Hashrate</p>
+              <span class="overview" id="b-nethashrate">{$GLOBAL.nethashrate|number_format:"2"}</span><span> {$GLOBAL.hashunits.network}</span>
               <br>
               <span class="pool-nethashrate-bar"></span>
           </div>
diff --git a/public/templates/bootstrap/dashboard/round_stats.tpl b/public/templates/bootstrap/dashboard/round_stats.tpl
index 9b2e28fd..ef3ea8e0 100644
--- a/public/templates/bootstrap/dashboard/round_stats.tpl
+++ b/public/templates/bootstrap/dashboard/round_stats.tpl
@@ -18,7 +18,7 @@
             <p class="text-muted">Of Expected Shares</p>
           </div>
           <div class="col-xs-4 b-r">
-            <i class="fa fa-btc fa-2x"></i>
+            <i class="fa fa-money fa-2x"></i>
             <p id="b-payout" class="h4 font-bold m-t">{$GLOBAL.userdata.estimates.payout|number_format:"8"}</p>
             <p class="text-muted">{$GLOBAL.config.currency} Estimated Earnings</p>
           </div>
diff --git a/public/templates/bootstrap/gettingstarted/default.tpl b/public/templates/bootstrap/gettingstarted/default.tpl
index 76218156..5928b5d7 100644
--- a/public/templates/bootstrap/gettingstarted/default.tpl
+++ b/public/templates/bootstrap/gettingstarted/default.tpl
@@ -22,22 +22,24 @@
       </ul>
     </li>
     <p>3. <strong>Configure your miner.</strong></p>
+    <ul>
       <p>Settings for Stratum (recommended):</p>
       <table width="50%">
         <tbody>
-          <tr><td>STRATUM:</td><td><kbd>stratum+tcp://{$SITESTRATUMURL|default:$smarty.server.SERVER_NAME}</kbd></td></tr>
-          <tr><td>PORT:</td><td><kbd>{$SITESTRATUMPORT|default:"3333"}</kbd></td></tr>
-          <tr><td>Username:</td><td><kbd><em>Weblogin.Worker</em></kbd></td></tr>
-          <tr><td>Password:</td><td><kbd><em>Worker Password</em></kbd></td></tr>
+          <tr><td>STRATUM:</td><td>stratum+tcp://{$SITESTRATUMURL|default:$smarty.server.SERVER_NAME}</td></tr>
+          <tr><td>PORT:</td><td>{$SITESTRATUMPORT|default:"3333"}</td></tr>
+          <tr><td>Username:</td><td>Weblogin.Worker</td></tr>
+          <tr><td>Password:</td><td>Worker Password</td></tr>
         </tbody>
       </table>
+      <br>
       <p>If you use a command-line miner, type:</p>
       <li>CGMiner</li>
       <pre>./cgminer {if $GLOBAL.config.algorithm == 'scrypt'}--scrypt{/if} -o stratum+tcp://{$SITESTRATUMURL|default:$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT|default:"3333"} -u <em>Weblogin</em>.<em>Worker</em> -p <em>Worker password</em></pre>
       <li>BFGMiner</li>
       <pre>./bfgminer {if $GLOBAL.config.algorithm == 'scrypt'}--scrypt{/if} -o stratum+tcp://{$SITESTRATUMURL|default:$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT|default:"3333"} -u <em>Weblogin</em>.<em>Worker</em> -p <em>Worker password</em></pre>
       <p>If you want, you can create additional workers with usernames and passwords of your choice <a href="{$smarty.server.SCRIPT_NAME}?page=account&action=workers">here</a></p>
-    </li>
+    </ul>
     <p>4. <strong>Create a {$SITECOINNAME|default:"Litecoin"} address to recieve payments.</strong></p>
       <ul>
         <li> Downloading the client &amp; block chain: 	Download the {$SITECOINNAME|default:"Litecoin"} client from <a href="{$SITECOINURL|default:"http://www.litecoin.org"}" target="_blank">here</a>.
diff --git a/public/templates/bootstrap/register/default.tpl b/public/templates/bootstrap/register/default.tpl
index fe8df99d..b8b6f225 100644
--- a/public/templates/bootstrap/register/default.tpl
+++ b/public/templates/bootstrap/register/default.tpl
@@ -16,27 +16,35 @@
         <i class="fa fa-edit fa-fw"></i> Register new account
       </div>
       <div class="panel-body">
-        <div class="form-group">
-          <label>Username</label>
-          <input type="text" class="form-control" name="username" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
+        <label>Username</label>
+        <div class="input-group margin-bottom-sm">
+          <span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
+          <input type="text" class="form-control" name="username" placeholder="Usermane" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
         </div>
-        <div class="form-group">
-          <label>Password</label>
-          <span style="padding-right:10px;display:block;margin-top:1px;float:right;color:#999;" id="pw_strength">Strength</span>
-          <input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required>
-          <label>Repeat Password</label>
-          <span style="padding-right:10px;display:block;margin-top:1px;float:right;" id="pw_match"></span>
-          <input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required>
+        <label>Password</label> (<span id="pw_strength">Strength</span>)
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
+          <input type="password" class="form-control" name="password1" placeholder="Password" value="" size="15" maxlength="100" id="pw_field" required>
         </div>
-        <div class="form-group">
-          <label>Email</label>
-          <input type="text" name="email1" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
-          <label>Email Repeat</label>
-          <input type="text" class="form-control" name="email2" value="{$smarty.post.email2|escape|default:""}" size="15" required>
+        <span id="pw_match"></span>
+        <div class="input-group margin-bottom-sm">
+          <span class="input-group-addon" id="pw_match"><i class="fa fa-key fa-fw"></i></span>
+          <input type="password" class="form-control" name="password2" placeholder="Repeat Password" value="" size="15" maxlength="100" id="pw_field2" required>
         </div>
-        <div class="form-group">
-          <label>PIN</label>
-          <input type="password" class="form-control" name="pin" value="" size="4" maxlength="4"><font size="1">Four digit number. <b>Remember this pin!</b></font>
+        <label>Email</label>
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
+          <input type="text" name="email1" placeholder="Email" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
+        </div>
+        <div class="input-group margin-bottom-sm">
+          <span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
+          <input type="text" class="form-control" name="email2" placeholder="Repeat Email" value="{$smarty.post.email2|escape|default:""}" size="15" required>
+        </div>
+        <label>PIN</label>
+        <font size="1">Four digit number. <b>Remember this pin!</b></font>
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
+          <input type="password" class="form-control" name="pin" placeholder="PIN" value="" size="4" maxlength="4" required>   
         </div>
         <div class="form-group">
           <div class="checkbox">