diff --git a/includes/admin.php b/includes/admin.php
index ea2ede1f..8592b178 100755
--- a/includes/admin.php
+++ b/includes/admin.php
@@ -38,32 +38,32 @@ function DisplayAuthConfig($username, $password){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-lock fa-fw"></i>Configure Auth</div>
+        <div class="panel-heading"><i class="fa fa-lock fa-fw"></i><?php echo _("Configure Auth"); ?></div>
         <div class="panel-body">
           <p><?php $status->showMessages(); ?></p>
           <form role="form" action="?page=auth_conf" method="POST">
             <?php CSRFToken() ?>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="username">Username</label>
+                <label for="username"><?php echo _("Username"); ?></label>
                 <input type="text" class="form-control" name="username" value="<?php echo $username; ?>"/>
               </div>
             </div>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="password">Old password</label>
+                <label for="password"><?php echo _("Old password"); ?></label>
                 <input type="password" class="form-control" name="oldpass"/>
               </div>
             </div>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="password">New password</label>
+                <label for="password"><?php echo _("New password"); ?></label>
                 <input type="password" class="form-control" name="newpass"/>
               </div>
             </div>
             <div class="row">
               <div class="form-group col-md-4">
-                <label for="password">Repeat new password</label>
+                <label for="password"><?php echo _("Repeat new password"); ?></label>
                 <input type="password" class="form-control" name="newpassagain"/>
               </div>
             </div>
diff --git a/includes/configure_client.php b/includes/configure_client.php
index 4b1ede62..24eca808 100755
--- a/includes/configure_client.php
+++ b/includes/configure_client.php
@@ -145,7 +145,7 @@ function DisplayWPAConfig(){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">           
-        <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client</div>
+        <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> <?php echo _("Configure client"); ?></div>
         <!-- /.panel-heading -->
         <div class="panel-body">
           <p><?php $status->showMessages(); ?></p>
@@ -159,10 +159,10 @@ function DisplayWPAConfig(){
             <table class="table table-responsive table-striped">
               <tr>
                 <th></th>
-                <th>SSID</th>
-                <th>Channel</th>
-                <th>Security</th>
-                <th>Passphrase</th>
+                <th><?php echo _("SSID"); ?></th>
+                <th><?php echo _("Channel"); ?></th>
+                <th><?php echo _("Security"); ?></th>
+                <th><?php echo _("Passphrase"); ?></th>
                 <th></th>
               </tr>
             <?php $index = 0; ?>
@@ -207,7 +207,7 @@ function DisplayWPAConfig(){
             </table>
           </form>
         </div><!-- ./ Panel body -->
-        <div class="panel-footer"><strong>Note,</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP.</div>
+        <div class="panel-footer"><?php echo _("<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?></div>
       </div><!-- /.panel-primary -->
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
diff --git a/includes/dashboard.php b/includes/dashboard.php
index 1f66542a..995c5c47 100755
--- a/includes/dashboard.php
+++ b/includes/dashboard.php
@@ -77,24 +77,24 @@ function DisplayDashboard(){
   <div class="row">
       <div class="col-lg-12">
           <div class="panel panel-primary">
-            <div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> Dashboard   </div>
+            <div class="panel-heading"><i class="fa fa-dashboard fa-fw"></i> <?php echo _("Dashboard"); ?></div>
               <div class="panel-body">
                 <p><?php $status->showMessages(); ?></p>
                   <div class="row">
                         <div class="col-md-6">
                         <div class="panel panel-default">
                   <div class="panel-body">
-                      <h4>Interface Information</h4>
-          <div class="info-item">Interface Name</div> wlan0</br>
-          <div class="info-item">IP Address</div>     <?php echo $strIPAddress ?></br>
-          <div class="info-item">Subnet Mask</div>    <?php echo $strNetMask ?></br>
-          <div class="info-item">Mac Address</div>    <?php echo $strHWAddress ?></br></br>
+                      <h4><?php echo _("Interface Information"); ?></h4>
+          <div class="info-item"><?php echo _("Interface Name"); ?></div> wlan0</br>
+          <div class="info-item"><?php echo _("IP Address"); ?></div>     <?php echo $strIPAddress ?></br>
+          <div class="info-item"><?php echo _("Subnet Mask"); ?></div>    <?php echo $strNetMask ?></br>
+          <div class="info-item"><?php echo _("Mac Address"); ?></div>    <?php echo $strHWAddress ?></br></br>
 
-                      <h4>Interface Statistics</h4>
-          <div class="info-item">Received Packets</div>    <?php echo $strRxPackets ?></br>
-          <div class="info-item">Received Bytes</div>      <?php echo $strRxBytes ?></br></br>
-          <div class="info-item">Transferred Packets</div> <?php echo $strTxPackets ?></br>
-          <div class="info-item">Transferred Bytes</div>   <?php echo $strTxBytes ?></br>
+                      <h4><?php echo _("Interface Statistics"); ?></h4>
+          <div class="info-item"><?php echo _("Received Packets"); ?></div>    <?php echo $strRxPackets ?></br>
+          <div class="info-item"><?php echo _("Received Bytes"); ?></div>      <?php echo $strRxBytes ?></br></br>
+          <div class="info-item"><?php echo _("Transferred Packets"); ?></div> <?php echo $strTxPackets ?></br>
+          <div class="info-item"><?php echo _("Transferred Bytes"); ?></div>   <?php echo $strTxBytes ?></br>
         </div><!-- /.panel-body -->
         </div><!-- /.panel-default -->
                         </div><!-- /.col-md-6 -->
@@ -102,14 +102,14 @@ function DisplayDashboard(){
         <div class="col-md-6">
                     <div class="panel panel-default">
               <div class="panel-body wireless">
-                            <h4>Wireless Information</h4>
-          <div class="info-item">Connected To</div>   <?php echo $strSSID ?></br>
-          <div class="info-item">AP Mac Address</div> <?php echo $strBSSID ?></br>
-          <div class="info-item">Bitrate</div>        <?php echo $strBitrate ?></br>
-          <div class="info-item">Signal Level</div>        <?php echo $strSignalLevel ?></br>
-          <div class="info-item">Transmit Power</div> <?php echo $strTxPower ?></br>
-          <div class="info-item">Frequency</div>      <?php echo $strFrequency ?></br></br>
-          <div class="info-item">Link Quality</div>
+                            <h4><?php echo _("Wireless Information"); ?></h4>
+          <div class="info-item"><?php echo _("Connected To"); ?></div>   <?php echo $strSSID ?></br>
+          <div class="info-item"><?php echo _("AP Mac Address"); ?></div> <?php echo $strBSSID ?></br>
+          <div class="info-item"><?php echo _("Bitrate"); ?></div>        <?php echo $strBitrate ?></br>
+          <div class="info-item"><?php echo _("Signal Level"); ?></div>	<?php echo $strSignalLevel ?></br>
+          <div class="info-item"><?php echo _("Transmit Power"); ?></div> <?php echo $strTxPower ?></br>
+          <div class="info-item"><?php echo _("Frequency"); ?></div>      <?php echo $strFrequency ?></br></br>
+          <div class="info-item"><?php echo _("Link Quality"); ?></div>
             <div class="progress">
             <div class="progress-bar progress-bar-info progress-bar-striped active"
               role="progressbar"
@@ -119,25 +119,25 @@ function DisplayDashboard(){
           </div>
         </div><!-- /.panel-body -->
         </div><!-- /.panel-default -->
-                        </div><!-- /.col-md-6 -->
+      </div><!-- /.col-md-6 -->
       </div><!-- /.row -->
 
                   <div class="col-lg-12">
                  <div class="row">
                     <form action="?page=wlan0_info" method="POST">
                     <?php if ( !$wlan0up ) {
-                      echo '<input type="submit" class="btn btn-success" value="Start wlan0" name="ifup_wlan0" />';
+                      echo '<input type="submit" class="btn btn-success" value="' . _("Start wlan0") . '" name="ifup_wlan0" />';
                     } else {
-                echo '<input type="submit" class="btn btn-warning" value="Stop wlan0" name="ifdown_wlan0" />';
+                echo '<input type="submit" class="btn btn-warning" value="' . _("Stop wlan0") . '"  name="ifdown_wlan0" />';
               }
               ?>
-              <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
+              <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
               </form>
             </div>
               </div>
 
                 </div><!-- /.panel-body -->
-                <div class="panel-footer">Information provided by ifconfig and iwconfig</div>
+                <div class="panel-footer"><?php echo _("Information provided by ifconfig and iwconfig"); ?></div>
             </div><!-- /.panel-default -->
         </div><!-- /.col-lg-12 -->
     </div><!-- /.row -->
diff --git a/includes/dhcp.php b/includes/dhcp.php
index 465d56e4..f65059f6 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -98,16 +98,15 @@ function DisplayDHCPConfig() {
   <div class="row">
   <div class="col-lg-12">
       <div class="panel panel-primary">
-      <div class="panel-heading"><i class="fa fa-exchange fa-fw"></i> Configure DHCP
-            </div>
+      <div class="panel-heading"><i class="fa fa-exchange fa-fw"></i> <?php echo _("Configure DHCP"); ?></div>
         <!-- /.panel-heading -->
         <div class="panel-body">
         <p><?php $status->showMessages(); ?></p>
         <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-                <li class="active"><a href="#server-settings" data-toggle="tab">Server settings</a>
+                <li class="active"><a href="#server-settings" data-toggle="tab"><?php echo _("Server settings"); ?></a>
                 </li>
-                <li><a href="#client-list" data-toggle="tab">Client list</a>
+                <li><a href="#client-list" data-toggle="tab"><?php echo _("Client list"); ?></a>
                 </li>
             </ul>
         <!-- Tab panes -->
@@ -136,36 +135,36 @@ function DisplayDHCPConfig() {
     </div>
     <div class="row">
       <div class="form-group col-md-4">
-        <label for="code">Starting IP Address</label>
+        <label for="code"><?php echo _("Starting IP Address"); ?></label>
         <input type="text" class="form-control"name="RangeStart" value="<?php echo $RangeStart; ?>" />
       </div>
     </div>
 
     <div class="row">
       <div class="form-group col-md-4">
-        <label for="code">Ending IP Address</label>
+        <label for="code"><?php echo _("Ending IP Address"); ?></label>
         <input type="text" class="form-control" name="RangeEnd" value="<?php echo $RangeEnd; ?>" />
       </div>
     </div>
 
     <div class="row">
       <div class="form-group col-xs-2 col-sm-2">
-        <label for="code">Lease Time</label>
+        <label for="code"><?php echo _("Lease Time"); ?></label>
         <input type="text" class="form-control" name="RangeLeaseTime" value="<?php echo $arrRangeLeaseTime[1]; ?>" />
       </div>
       <div class="col-xs-2 col-sm-2">
-        <label for="code">Interval</label>
+        <label for="code"><?php echo _("Interval"); ?></label>
         <select name="RangeLeaseTimeUnits" class="form-control" ><option value="m" <?php echo $mselected; ?>>Minute(s)</option><option value="h" <?php echo $hselected; ?>>Hour(s)</option><option value="d" <?php echo $dselected; ?>>Day(s)</option><option value="infinite">Infinite</option></select> 
       </div>
     </div>
 
-    <input type="submit" class="btn btn-outline btn-primary" value="Save settings" name="savedhcpdsettings" />
+    <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
     <?php
 
     if ( $dnsmasq_state ) {
-      echo '<input type="submit" class="btn btn-warning" value="Stop dnsmasq" name="stopdhcpd" />';
+      echo '<input type="submit" class="btn btn-warning" value="' . _("Stop dnsmasq") . '" name="stopdhcpd" />';
     } else {
-      echo'<input type="submit" class="btn btn-success" value="Start dnsmasq" name="startdhcpd" />';
+      echo'<input type="submit" class="btn btn-success" value="' .  _("Start dnsmasq") . '" name="startdhcpd" />';
     }
     ?>
     </form>
@@ -175,20 +174,18 @@ function DisplayDHCPConfig() {
     <h4>Client list</h4>
     <div class="col-lg-12">
       <div class="panel panel-default">
-      <div class="panel-heading">
-        Active DHCP leases
-      </div>
+      <div class="panel-heading"><?php echo _("Active DHCP leases"); ?></div>
       <!-- /.panel-heading -->
       <div class="panel-body">
         <div class="table-responsive">
           <table class="table table-hover">
             <thead>
               <tr>
-                <th>Expire time</th>
-                <th>MAC Address</th>
-                <th>IP Address</th>
-                <th>Host name</th>
-                <th>Client ID</th>
+                <th><?php echo _("Expire time"); ?></th>
+                <th><?php echo _("MAC Address"); ?></th>
+                <th><?php echo _("IP Address"); ?></th>
+                <th><?php echo _("Host name"); ?></th>
+                <th><?php echo _("Client ID"); ?></th>
               </tr>
             </thead>
             <tbody>
@@ -213,7 +210,7 @@ function DisplayDHCPConfig() {
     </div><!-- /.tab-pane -->
     </div><!-- /.tab-content -->
     </div><!-- ./ Panel body -->
-    <div class="panel-footer"> Information provided by Dnsmasq</div>
+    <div class="panel-footer"> <?php echo _("Information provided by Dnsmasq");?></div>
         </div><!-- /.panel-primary -->
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
diff --git a/includes/hostapd.php b/includes/hostapd.php
index ece1a83d..46ca8aae 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -64,27 +64,27 @@ function DisplayHostAPDConfig(){
   <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-primary">
-        <div class="panel-heading"><i class="fa fa-dot-circle-o fa-fw"></i> Configure hotspot</div>
+        <div class="panel-heading"><i class="fa fa-dot-circle-o fa-fw"></i> <?php echo _("Configure hotspot"); ?></div>
         <!-- /.panel-heading -->
         <div class="panel-body">
 	  <p><?php $status->showMessages(); ?></p>
           <form role="form" action="?page=hostapd_conf" method="POST">
             <!-- Nav tabs -->
             <ul class="nav nav-tabs">
-              <li class="active"><a href="#basic" data-toggle="tab">Basic</a></li>
-              <li><a href="#security" data-toggle="tab">Security</a></li>
-              <li><a href="#advanced" data-toggle="tab">Advanced</a></li>
+              <li class="active"><a href="#basic" data-toggle="tab"><?php echo _("Basic"); ?></a></li>
+              <li><a href="#security" data-toggle="tab"><?php echo _("Security"); ?></a></li>
+              <li><a href="#advanced" data-toggle="tab"><?php echo _("Advanced"); ?></a></li>
             </ul>
 
             <!-- Tab panes -->
             <div class="tab-content">
                 <div class="tab-pane fade in active" id="basic">
 
-                <h4>Basic settings</h4>
+                <h4><?php echo _("Basic settings") ;?></h4>
                 <?php CSRFToken() ?>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Interface</label>
+                    <label for="code"><?php echo _("Interface") ;?></label>
                     <?php
                       SelectorOptions('interface', $interfaces, $arrConfig['interface']);
                     ?>
@@ -92,49 +92,49 @@ function DisplayHostAPDConfig(){
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">SSID</label>
+                    <label for="code"><?php echo _("SSID"); ?></label>
                     <input type="text" class="form-control" name="ssid" value="<?php echo $arrConfig['ssid']; ?>" />
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Wireless Mode</label>
+                    <label for="code"><?php echo _("Wireless Mode") ;?></label>
                     <?php SelectorOptions('hw_mode', $arrChannel, $arrConfig['hw_mode']); ?>
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Channel</label>
+                    <label for="code"><?php echo _("Channel"); ?></label>
                     <?php SelectorOptions('channel', range(1, 14), intval($arrConfig['channel'])) ?>
                   </div>
                 </div>
               </div>
               <div class="tab-pane fade" id="security">
-                <h4>Security settings</h4>
+                <h4><?php echo _("Security settings"); ?></h4>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Security type</label>
+                    <label for="code"><?php echo _("Security type"); ?></label>
                     <?php SelectorOptions('wpa', $arrSecurity, $arrConfig['wpa']); ?>
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">Encryption Type</label>
+                    <label for="code"><?php echo _("Encryption Type"); ?></label>
                     <?php SelectorOptions('wpa_pairwise', $arrEncType, $arrConfig['wpa_pairwise']); ?>
                   </div>
                 </div>
                 <div class="row">
                   <div class="form-group col-md-4">
-                    <label for="code">PSK</label>
+                    <label for="code"><?php echo _("PSK"); ?></label>
                     <input type="text" class="form-control" name="wpa_passphrase" value="<?php echo $arrConfig['wpa_passphrase'] ?>" />
                   </div>
                 </div>
               </div>
               <div class="tab-pane fade" id="advanced">
-                <h4>Advanced settings</h4>
+                <h4><?php echo _("Advanced settings"); ?></h4>
                 <div class="row">
                   <div class="form-group col-md-4">
-                  <label for="code">Country Code</label>
+                  <label for="code"><?php echo _("Country Code"); ?></label>
                   <input type="hidden" id="selected_country" value="<?php echo $arrConfig['country_code'] ?>">
                   <select  class="form-control"  id="countries" name="country_code">
                     <option value="AF">Afghanistan</option>
@@ -411,7 +411,7 @@ function DisplayHostAPDConfig(){
             ?>
           </form>
         </div></div><!-- /.panel-primary -->
-      <div class="panel-footer"> Information provided by hostapd</div>
+      <div class="panel-footer"> <?php echo _("Information provided by hostapd"); ?></div>
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
 <?php 
diff --git a/includes/locale.php b/includes/locale.php
index 2d9aabc7..af6f6c18 100755
--- a/includes/locale.php
+++ b/includes/locale.php
@@ -5,26 +5,30 @@
 *
 */
 
-$lang = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-
-switch ($lang){
-    case "de":
-        $locale = "de_DE.UTF-8";
-        break;
-    case "fr":
-        $locale = "fr_FR.UTF-8";
-        break;
-    case "it":
-        $locale = "it_IT.UTF-8";
-        break;        
-    default:
-        $locale = "en_US.UTF-8";
-        break;
+if (!isset($_SESSION["locale"])) {
+    $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+    switch ($lang){
+        case "de":
+            $locale = "de_DE.UTF-8";
+            break;
+        case "fr":
+            $locale = "fr_FR.UTF-8";
+            break;
+        case "it":
+            $locale = "it_IT.UTF-8";
+            break;        
+        default:
+            $locale = "en_US.UTF-8";
+            break;
+    }
 }
-                                                                                                                                                                                          
+
+// debug
+$locale = "fr_FR.UTF-8";
+$_SESSION["locale"] = $locale;                                                                                                                                                                                          
 // activate the locale setting                                                                                                                                                            
-putenv("LANG=" . $locale);                                                                                                                                                                
-setlocale(LC_ALL, $locale);                                                                                                                                                               
+putenv("LANG=" . $_SESSION["locale"]);                                                                                                                                                                
+setlocale(LC_ALL, $_SESSION["locale"]);                                                                                                                                                               
                                                                                                                                                                                           
 $domain = "messages";                                                                                                                                                                     
 $locale_root = "locale";                                                                                                                                              
@@ -32,14 +36,4 @@ bindtextdomain($domain, $locale_root);
 bind_textdomain_codeset($domain, 'UTF-8');                                                                                                                                                
                                                                                                                                                                                           
 textdomain($domain);                                                                                                                                                                      
-                                                                                                                                                                                          
-// debug                                                                                                                                                                                  
-echo '<br>locale: ' . $locale . "<br>";                                                                                                                                                       
-echo 'locale root: ' .$locale_root . "<br>";                                                                                                                                              
-                                                                                                                                                                                          
-$results = bindtextdomain($domain, $locale_root);                                                                                                                                         
-echo 'new text domain is set: ' . $results. "<br>";                                                                                                                                       
-                                                                                                                                                                                          
-$results = textdomain($domain);                                                                                                                                                           
-echo 'current message domain is set: ' . $results. "<br>";                                                                                                                                
 ?>
diff --git a/includes/system.php b/includes/system.php
index 213e87a8..b0899217 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -74,7 +74,7 @@ function DisplaySystem(){
 
   // cpu load
   $cores   = exec("grep -c ^processor /proc/cpuinfo");
-        $loadavg = exec("awk '{print $1}' /proc/loadavg");
+  $loadavg = exec("awk '{print $1}' /proc/loadavg");
   $cpuload = floor(($loadavg * 100) / $cores);
   if     ($cpuload > 90) { $cpuload_status = "danger";  }
   elseif ($cpuload > 75) { $cpuload_status = "warning"; }
@@ -84,7 +84,7 @@ function DisplaySystem(){
   <div class="row">
   <div class="col-lg-12">
   <div class="panel panel-primary">
-  <div class="panel-heading"><i class="fa fa-cube fa-fw"></i> System</div>
+  <div class="panel-heading"><i class="fa fa-cube fa-fw"></i> <?php echo _("System"); ?></div>
   <div class="panel-body">
 
     <?php
@@ -103,19 +103,19 @@ function DisplaySystem(){
     <div class="panel panel-default">
     <div class="panel-body">
     <ul class="nav nav-tabs" role="tablist">
-        <li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab">System</a></li>
-        <li role="presentation" class="consoletab"><a href="#console" aria-controls="console" role="tab" data-toggle="tab">Console</a></li>
+        <li role="presentation" class="active systemtab"><a href="#system" aria-controls="system" role="tab" data-toggle="tab"><?php echo _("System"); ?></a></li>
+        <li role="presentation" class="consoletab"><a href="#console" aria-controls="console" role="tab" data-toggle="tab"><?php echo _("Console"); ?></a></li>
     </ul>
 
     <div class="systemtabcontent tab-content">
         <div role="tabpanel" class="tab-pane active" id="system">
             <div class="row">
                 <div class="col-lg-6">
-                        <h4>System Information</h4>
-                        <div class="info-item">Hostname</div> <?php echo $hostname ?></br>
-                        <div class="info-item">Pi Revision</div> <?php echo RPiVersion() ?></br>
-                        <div class="info-item">Uptime</div>   <?php echo $uptime ?></br></br>
-                        <div class="info-item">Memory Used</div>
+                        <h4><?php echo _("System Information"); ?></h4>
+                        <div class="info-item"><?php echo _("Hostname"); ?></div> <?php echo $hostname ?></br>
+                        <div class="info-item"><?php echo _("Pi Revision"); ?></div> <?php echo RPiVersion() ?></br>
+                        <div class="info-item"><?php echo _("Uptime"); ?></div>   <?php echo $uptime ?></br></br>
+                        <div class="info-item"><?php echo _("Memory Used"); ?></div>
                         <div class="progress">
                         <div class="progress-bar progress-bar-<?php echo $memused_status ?> progress-bar-striped active"
                         role="progressbar"
@@ -123,7 +123,7 @@ function DisplaySystem(){
                         style="width: <?php echo $memused ?>%;"><?php echo $memused ?>%
                         </div>
                         </div>
-                        <div class="info-item">CPU Load</div>
+                        <div class="info-item"><?php echo _("CPU Load"); ?></div>
                         <div class="progress">
                         <div class="progress-bar progress-bar-<?php echo $cpuload_status ?> progress-bar-striped active"
                         role="progressbar"
@@ -133,16 +133,20 @@ function DisplaySystem(){
                         </div>
 
                         <form action="?page=system_info" method="POST">
-                        <input type="submit" class="btn btn-warning" name="system_reboot"   value="Reboot" />
-                        <input type="submit" class="btn btn-warning" name="system_shutdown" value="Shutdown" />
-                        <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
+                        <input type="submit" class="btn btn-warning" name="system_reboot"   value="<?php echo _("Reboot"); ?>" />
+                        <input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
+                        <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
                         </form>
                 </div>
             </div>
         </div>
-      <div role="tabpanel" class="tab-pane" id="console">
-      <iframe src="includes/webconsole.php" class="webconsole"></iframe>
-      </div>
+        <div role="tabpanel" class="tab-pane" id="console">
+            <div class="row">                                                                                                                                                             
+                <div class="col-lg-12"> 
+                    <iframe src="includes/webconsole.php" class="webconsole"></iframe>
+                </div>
+            </div>
+       </div>
 
 
 
diff --git a/includes/themes.php b/includes/themes.php
index 44af3511..fb3850c0 100755
--- a/includes/themes.php
+++ b/includes/themes.php
@@ -25,18 +25,18 @@ function DisplayThemeConfig(){
   <div class="row">
   <div class="col-lg-12">
   <div class="panel panel-primary">
-  <div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> Change Theme</div>
+  <div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></div>
   <div class="panel-body">
     <div class="row">
     <div class="col-md-6">
     <div class="panel panel-default">
     <div class="panel-body">
-      <h4>Theme settings</h4>
+      <h4><?php echo _("Theme settings"); ?></h4>
 
   <div class="row">
           <div class="form-group col-md-6">
-            <label for="code">Select a theme</label>  
-              <select class="form-control" id="theme-select">Select a Theme
+            <label for="code"><?php echo _("Select a theme"); ?></label>  
+              <select class="form-control" id="theme-select"><?php echo _("Select a Theme"); ?>
                 <option value="default" class="theme-link" <?php echo $cselected; ?>>RaspAP (default)</option>
                 <option value="hackernews" class="theme-link"<?php echo $hselected; ?>>HackerNews</option>
                 <option value="terminal" class="theme-link" <?php echo $tselected; ?>>Terminal</option>
@@ -50,7 +50,7 @@ function DisplayThemeConfig(){
     </div><!-- /.row -->
 
     <form action="?page=system_info" method="POST">
-      <input type="button" class="btn btn-outline btn-primary" value="Refresh" onclick="document.location.reload(true)" />
+      <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
     </form>
 
   </div><!-- /.panel-body -->
diff --git a/index.php b/index.php
index 79f4f0b6..1665dfbf 100755
--- a/index.php
+++ b/index.php
@@ -146,7 +146,7 @@ $theme_url = 'dist/css/' . $theme;
                 <a href="index.php?page=hostapd_conf"><i class="fa fa-dot-circle-o fa-fw"></i> <?php echo _("Configure hotspot"); ?></a>
               </li>
               <li>
-                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> <?php echo _("Configure DHCP Server"); ?></a>
+                <a href="index.php?page=dhcpd_conf"><i class="fa fa-exchange fa-fw"></i> <?php echo _("Configure DHCP"); ?></a>
               </li>
               <?php if ( RASPI_OPENVPN_ENABLED ) : ?>
               <li>