diff --git a/src/admin/application.php b/src/admin/application.php
index c59c1bc..0d0511b 100755
--- a/src/admin/application.php
+++ b/src/admin/application.php
@@ -1,4 +1,4 @@
 <?php
 
 require_once __DIR__ . '/../core/application.php';
-require_once ROOT . '/core/admin.php';
+require_once ROOT . '/core/adminarea.php';
diff --git a/src/admin/controllers/dashboard/view.php b/src/admin/controllers/dashboard/view.php
index 5e61f92..48c4cbe 100755
--- a/src/admin/controllers/dashboard/view.php
+++ b/src/admin/controllers/dashboard/view.php
@@ -1,6 +1,6 @@
 <?php
 
-$PageInfo['title'] = 'Home Page';
+$PageInfo['title'] = 'Dashboard';
 $count_clients = $DB->count('clients', null);
 $count_account = $DB->count('account', array('account_status' => 1));
 $count_ssl = $DB->count('ssl');
diff --git a/src/admin/views/common/header.php b/src/admin/views/common/header.php
index c508d2c..55c147b 100755
--- a/src/admin/views/common/header.php
+++ b/src/admin/views/common/header.php
@@ -14,7 +14,7 @@
     <meta name="author" content="UIISC" />
     <meta name="copyright" content="® CROGRAM" />
 
-    <title><?php echo $PageInfo['title']; ?> - <?php echo $SiteConfig['site_name']; ?> Admin</title>
+    <title><?php echo $PageInfo['title']; ?> - <?php echo $lang->I18N('AdminArea'); ?> - <?php echo $SiteConfig['site_name']; ?></title>
     <link rel="icon" type="image/x-icon" href="<?php echo $site_url; ?>/assets/image/favicon.ico">
     <link rel="shortcut" type="image/x-icon" href="<?php echo $site_url; ?>/assets/image/favicon.ico">
 
diff --git a/src/admin/views/common/navbar.php b/src/admin/views/common/navbar.php
index b9dfdfb..b2f0a83 100755
--- a/src/admin/views/common/navbar.php
+++ b/src/admin/views/common/navbar.php
@@ -2,7 +2,7 @@
 <div class="page-wrapper with-navbar with-sidebar" data-sidebar-type="overlayed-sm-and-down">
     <nav class="navbar">
         <div class="container-fluid">
-            <a href="index.php" class="navbar-brand"><?php echo $SiteConfig['site_name']; ?></a>
+            <a href="index.php" class="navbar-brand"><?php echo $lang->I18N('Admin Area'); ?></a>
             <ul class="navbar-nav ml-auto">
                 <li class="nav-item nav-height">
                 <button class="btn btn-sm my-auto" role="button" onclick="halfmoon.toggleDarkMode()">
@@ -22,6 +22,8 @@
                     <i class="fa fa-user"></i>
                 </a>
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-link-dropdown-toggle">
+                    <a href="<?php echo $site_url; ?>" class="dropdown-item" target="_blank"><?php echo $lang->I18N('Home'); ?></a>
+                    <div class="dropdown-divider"></div>
                     <a href="profile.php" class="dropdown-item"><?php echo $lang->I18N('Profile'); ?></a>
                     <a href="settings.php" class="dropdown-item"><?php echo $lang->I18N('Settings'); ?></a>
                     <a href="logout.php" class="dropdown-item"><?php echo $lang->I18N('logout'); ?></a>
diff --git a/src/clientarea/views/common/header.php b/src/clientarea/views/common/header.php
index de37bec..fd1a65a 100755
--- a/src/clientarea/views/common/header.php
+++ b/src/clientarea/views/common/header.php
@@ -14,7 +14,7 @@
     <meta name="author" content="UIISC" />
     <meta name="copyright" content="® CROGRAM" />
 
-    <title><?php echo $PageInfo['title']; ?> - <?php echo $SiteConfig['site_name']; ?></title>
+    <title><?php echo $PageInfo['title']; ?> - <?php echo $lang->I18N('ClientArea'); ?> - <?php echo $SiteConfig['site_name']; ?></title>
     <link rel="icon" type="image/x-icon" href="<?php echo $site_url; ?>/assets/image/favicon.ico">
     <link rel="shortcut" type="image/x-icon" href="<?php echo $site_url; ?>/assets/image/favicon.ico">
 
diff --git a/src/clientarea/views/common/navbar.php b/src/clientarea/views/common/navbar.php
index a0bbecf..ee8241f 100755
--- a/src/clientarea/views/common/navbar.php
+++ b/src/clientarea/views/common/navbar.php
@@ -2,7 +2,7 @@
 <div class="page-wrapper with-navbar with-sidebar" data-sidebar-type="overlayed-sm-and-down">
     <nav class="navbar">
         <div class="container-fluid">
-            <a href="index.php" class="navbar-brand"><?php echo $SiteConfig['site_name']; ?></a>
+            <a href="index.php" class="navbar-brand"><?php echo $lang->I18N('Client Area'); ?></a>
             <ul class="navbar-nav ml-auto">
             <li class="nav-item nav-height">
                 <button class="btn btn-sm my-auto" role="button" onclick="halfmoon.toggleDarkMode()">
@@ -22,6 +22,8 @@
                     <i class="fa fa-user"></i>
                 </a>
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-link-dropdown-toggle">
+                    <a href="<?php echo $site_url; ?>" class="dropdown-item" target="_blank"><?php echo $lang->I18N('Home'); ?></a>
+                    <div class="dropdown-divider"></div>
                     <a href="profile.php" class="dropdown-item"><?php echo $lang->I18N('Profile'); ?></a>
                     <a href="settings.php" class="dropdown-item"><?php echo $lang->I18N('Settings'); ?></a>
                     <a href="logout.php" class="dropdown-item"><?php echo $lang->I18N('logout'); ?></a>
diff --git a/src/core/admin.php b/src/core/adminarea.php
similarity index 100%
rename from src/core/admin.php
rename to src/core/adminarea.php