diff --git a/public/include/classes/mail.class.php b/public/include/classes/mail.class.php
index aeb4659c..e25f3180 100644
--- a/public/include/classes/mail.class.php
+++ b/public/include/classes/mail.class.php
@@ -57,17 +57,17 @@ class Mail extends Base {
    **/
   public function sendMail($template, $aData) {
     // Make sure we don't load a cached filed
-    $this->smarty->clearCache(BASEPATH . 'templates/mail/' . $template  . '.tpl');
+    $this->smarty->clearCache(BASEPATH . 'templates/mail/' . $template . '.tpl');
     $this->smarty->clearCache(BASEPATH . 'templates/mail/subject.tpl');
     $this->smarty->assign('WEBSITENAME', $this->setting->getValue('website_name'));
     $this->smarty->assign('SUBJECT', $aData['subject']);
     $this->smarty->assign('DATA', $aData);
-    $headers = 'From: {$GLOBAL.website.name|default:"Unknown Pool"} <' . $this->setting->getValue('website_email') . ">\n";
+    $headers .= 'From: ' . $this->setting->getValue('website_name') . '<' . $this->setting->getValue('website_email') . ">\n";
     $headers .= "MIME-Version: 1.0\n";
     $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
     if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 )
       $headers .= 'Reply-To: ' . $aData['senderName'] . ' <' . $aData['senderEmail'] . ">\n";
-    if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template  . '.tpl'), $headers))
+    if (mail($aData['email'], $this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'), $this->smarty->fetch(BASEPATH . 'templates/mail/' . $template .$
       return true;
     $this->setErrorMessage($this->sqlError('E0031'));
     return false;
diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css
index ac246124..2ff6631a 100644
--- a/public/site_assets/mpos/css/layout.css
+++ b/public/site_assets/mpos/css/layout.css
@@ -684,7 +684,7 @@ margin: -5px 0 5px 0;
 text-transform: uppercase;
 }
 
-fieldset input[type=email], fieldset input[type=text], fieldset input[type=password] {
+fieldset input[type=text], fieldset input[type=email], fieldset input[type=password] {
 -webkit-border-radius: 5px;
 -moz-border-radius: 5px;
 border-radius: 5px;
diff --git a/public/templates/mpos/admin/settings/default.tpl b/public/templates/mpos/admin/settings/default.tpl
index 7ab60aed..1dc5979d 100644
--- a/public/templates/mpos/admin/settings/default.tpl
+++ b/public/templates/mpos/admin/settings/default.tpl
@@ -5,7 +5,7 @@
     <input type="hidden" name="do" value="save" />
     <header>
       <h3 class="tabs_involved">Settings</h3>
-      <ul class="tabs">
+      <ul style="margin: 10px 20px 0px 0px;" class="tabs">
 {foreach item=TAB from=array_keys($SETTINGS)}
         <li><a href="#{$TAB}">{$TAB|capitalize}</a></li>
 {/foreach}
@@ -14,6 +14,7 @@
     <div class="tab_container">
 {foreach item=TAB from=array_keys($SETTINGS)}
       <div class="tab_content module_content" id="{$TAB}">
+      <br />
 {section name=setting loop=$SETTINGS.$TAB}
         <fieldset>
           <label>{$SETTINGS.$TAB[setting].display}</label>