diff --git a/post/setting.php b/post/setting.php
index bb571458..ca76f778 100644
--- a/post/setting.php
+++ b/post/setting.php
@@ -39,7 +39,7 @@ if (isset($_POST['edit_company'])) {
         }
     }
 
-    mysqli_query($mysqli,"UPDATE companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website', company_locale = '$locale', company_currency = '$currency_code' WHERE company_id = 1");
+    mysqli_query($mysqli,"UPDATE companies SET company_name = '$name', company_address = '$address', company_city = '$city', company_state = '$state', company_zip = '$zip', company_country = '$country', company_phone = '$phone', company_email = '$email', company_website = '$website' WHERE company_id = 1");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Modify', log_description = '$session_name modified company $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
@@ -50,6 +50,24 @@ if (isset($_POST['edit_company'])) {
 
 }
 
+if (isset($_POST['edit_localization'])) {
+
+    validateAdminRole();
+
+    $locale = sanitizeInput($_POST['locale']);
+    $currency_code = sanitizeInput($_POST['currency_code']);
+
+    mysqli_query($mysqli,"UPDATE companies SET company_locale = '$locale', company_currency = '$currency_code' WHERE company_id = 1");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Company', log_action = 'Edit', log_description = '$session_name edited company $name localization settings', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Company localization updated";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_POST['edit_mail_smtp_settings'])) {
 
     validateAdminRole();
diff --git a/post/setting_company_model.php b/post/setting_company_model.php
index 49154caa..6ca8a801 100644
--- a/post/setting_company_model.php
+++ b/post/setting_company_model.php
@@ -8,5 +8,3 @@ $country = sanitizeInput($_POST['country']);
 $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
 $email = sanitizeInput($_POST['email']);
 $website = sanitizeInput($_POST['website']);
-$locale = sanitizeInput($_POST['locale']);
-$currency_code = sanitizeInput($_POST['currency_code']);
diff --git a/settings_company.php b/settings_company.php
index 8acd297f..61e6ddff 100644
--- a/settings_company.php
+++ b/settings_company.php
@@ -134,36 +134,6 @@ $company_initials = nullable_htmlentities(initials($company_name));
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Language <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-language"></i></span>
-                        </div>
-                        <select class="form-control select2" name="locale" required>
-                            <option value="">- Select a Locale -</option>
-                            <?php foreach($locales_array as $locale_code => $locale_name) { ?>
-                                <option <?php if ($company_locale == $locale_code) { echo "selected"; } ?> value="<?php echo $locale_code; ?>"><?php echo $locale_name; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Currency <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
-                        </div>
-                        <select class="form-control select2" name="currency_code" required>
-                            <option value="">- Currency -</option>
-                            <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
-                                <option <?php if ($company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
                 <hr>
 
                 <button type="submit" name="edit_company" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
diff --git a/settings_localization.php b/settings_localization.php
new file mode 100644
index 00000000..2d8b0ff3
--- /dev/null
+++ b/settings_localization.php
@@ -0,0 +1,59 @@
+<?php
+require_once("inc_all_settings.php");
+
+$sql = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
+
+$row = mysqli_fetch_array($sql);
+$company_id = intval($row['company_id']);
+$company_locale = nullable_htmlentities($row['company_locale']);
+$company_currency = nullable_htmlentities($row['company_currency']);
+
+?>
+
+    <div class="card card-dark">
+        <div class="card-header py-3">
+            <h3 class="card-title"><i class="fas fa-fw fa-globe mr-2"></i>Localization</h3>
+        </div>
+        <div class="card-body">
+            <form action="post.php" method="post" autocomplete="off">
+
+                <div class="form-group">
+                    <label>Language <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-language"></i></span>
+                        </div>
+                        <select class="form-control select2" name="locale" required>
+                            <option value="">- Select a Locale -</option>
+                            <?php foreach($locales_array as $locale_code => $locale_name) { ?>
+                                <option <?php if ($company_locale == $locale_code) { echo "selected"; } ?> value="<?php echo $locale_code; ?>"><?php echo $locale_name; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Currency <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>
+                        </div>
+                        <select class="form-control select2" name="currency_code" required>
+                            <option value="">- Currency -</option>
+                            <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                                <option <?php if ($company_currency == $currency_code) { echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
+                <hr>
+
+                <button type="submit" name="edit_localization" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Save</button>
+
+            </form>
+        </div>
+    </div>
+
+<?php
+require_once("footer.php");
diff --git a/settings_side_nav.php b/settings_side_nav.php
index 402370e8..74a8fd92 100644
--- a/settings_side_nav.php
+++ b/settings_side_nav.php
@@ -38,6 +38,43 @@
           </a>
         </li>
 
+        <li class="nav-item">
+          <a href="settings_mail_queue.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_mail_queue.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-mail-bulk"></i>
+            <p>Mail Queue</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="logs.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-history"></i>
+            <p>Audit Logs</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_backup.php") { echo "active"; } ?>"
+            href="settings_backup.php">
+            <i class="nav-icon fas fa-cloud-upload-alt"></i>
+            <p>Backup</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_update.php") { echo "active"; } ?>"
+            href="settings_update.php">
+            <i class="nav-icon fas fa-download"></i>
+            <p>Update</p>
+          </a>
+        </li>
+        
+        <li class="nav-item">
+          <a href="settings_debug.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_debug.php") { echo "active"; } ?>">
+            <i class="nav-icon fa fa-bug"></i>
+            <p>Debug</p>
+          </a>
+        </li>
+
         <li class="nav-header mt-3">TAGS & CATEGORIES</li>
 
         <li class="nav-item">
@@ -89,7 +126,14 @@
         <li class="nav-item">
           <a href="settings_company.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_company.php") { echo "active"; } ?>">
             <i class="nav-icon fa fa-briefcase"></i>
-            <p>Company</p>
+            <p>Company Details</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="settings_localization.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_localization.php") { echo "active"; } ?>">
+            <i class="nav-icon fa fa-globe"></i>
+            <p>Localization</p>
           </a>
         </li>
 
@@ -170,14 +214,6 @@
           </a>
         </li>
 
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_update.php") { echo "active"; } ?>"
-            href="settings_update.php">
-            <i class="nav-icon fas fa-download"></i>
-            <p>Update</p>
-          </a>
-        </li>
-
         <li class="nav-item">
           <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_telemetry.php") { echo "active"; } ?>"
             href="settings_telemetry.php">
@@ -186,14 +222,6 @@
           </a>
         </li>
 
-        <li class="nav-item">
-          <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_backup.php") { echo "active"; } ?>"
-            href="settings_backup.php">
-            <i class="nav-icon fas fa-cloud-upload-alt"></i>
-            <p>Backup</p>
-          </a>
-        </li>
-
         <li class="nav-item">
           <a class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_modules.php") { echo "active"; } ?>"
              href="settings_modules.php">
@@ -202,26 +230,6 @@
           </a>
         </li>
 
-        <li class="nav-item">
-          <a href="settings_debug.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_debug.php") { echo "active"; } ?>">
-            <i class="nav-icon fa fa-bug"></i>
-            <p>Debug</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="settings_mail_queue.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_mail_queue.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-mail-bulk"></i>
-            <p>Mail Queue</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="logs.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-history"></i>
-            <p>Audit Logs</p>
-          </a>
-        </li>
       </ul>
 
     </nav>