diff --git a/inc/header.inc.php b/inc/header.inc.php
index 091fca4..0bd02e1 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -139,7 +139,7 @@
         <ul class="navbar-nav me-auto mb-2 mb-lg-0">
 <?php if ($session_status == true): ?>
           <!-- START NAVBAR MENU FOR ALL LOGGED IN -->
-          <li class="nav-item"><a class="nav-link<?php if ($app_current_pagename==$transLang['HOME']): echo " active"; endif; ?>" href="index.php"><i class="fas fa-home"></i> <?php echo $transLang['HOME']; ?></a></li>
+          <li class="nav-item"><a class="nav-link<?php if ($app_current_pagename==$transLang['STR_COMMON_HOME']): echo " active"; endif; ?>" href="index.php"><i class="fas fa-home"></i> <?php echo $transLang['STR_COMMON_HOME']; ?></a></li>
           <li class="nav-item"><a class="nav-link<?php if ($app_current_pagename==$transLang['ACCOUNT']): echo " active"; endif; ?>" href="profile.php"><i class="fas fa-user-circle"></i> <?php echo $transLang['ACCOUNT']; ?></a></li>
           <li class="nav-item"><a class="nav-link<?php if ($app_current_pagename==$transLang['REPORTS']): echo " active"; endif; ?>" href="reports.php"><i class="fas fa-chart-pie"></i> <?php echo $transLang['REPORTS']; ?></a></li>
           <!-- END NAVBAR MENU FOR ALL LOGGED IN -->
@@ -193,7 +193,7 @@
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <h5 class="modal-title" id="Site"><i class="fas fa-map-marker-alt"></i> <?php echo $transLang['SITE']; ?></h5>
+          <h5 class="modal-title" id="Site"><i class="fas fa-map-marker-alt"></i> <?php echo $transLang['STR_COMMON_SITE']; ?></h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
@@ -205,7 +205,7 @@
                 <option value="<?php echo $row['sites_id']; ?>"<?php if ($row['sites_id']==$siteid) { echo " selected"; } ?>><?php if ($row['sites_name']=="NOSITE") {echo $transLang['NOSITE'];} else { echo $row['sites_name']; } ?></option>
 <?php endforeach; ?>
               </select>
-              <button class="btn btn-primary" type="submit" value="<?php echo $transLang['SAVE']; ?>"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
+              <button class="btn btn-primary" type="submit" value="<?php echo $transLang['STR_COMMON_SAVE']; ?>"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['STR_COMMON_SAVE']; ?></button>
             </div>
           </form>
         </div>
diff --git a/index.php b/index.php
index e6c6504..d9ba50a 100644
--- a/index.php
+++ b/index.php
@@ -78,7 +78,7 @@
     $IDTypeInfo = new \App\LobbySIO\Database\IDTypeInfo();
     $VisitInfo = new \App\LobbySIO\Database\VisitInfo();
     $VisitActions = new \App\LobbySIO\Database\VisitActions();
-    $app_current_pagename = $transLang['HOME'];                                 // PAGE SETUP
+    $app_current_pagename = $transLang['STR_COMMON_HOME'];                                 // PAGE SETUP
     $app_current_pageicon = '<i class="fas fa-home"></i> ';
     require_once("inc/header.inc.php");
       header("X-Frame-Options: SAMEORIGIN");
@@ -287,7 +287,7 @@ if($form_data['form_data_isvendor'] === (int)"1") {
             </div>
             <div class="row row-cols-1">
               <div class="col d-grid gap-2">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['STR_COMMON_CANCEL']; ?></button>
                 <button type="submit" class="btn btn-danger btn-sm"><i class="fas fa-thumbs-down"></i>&nbsp;<?php echo $transLang['DECLINE']; ?></button>
               </div>
             </div>
@@ -314,7 +314,7 @@ if($form_data['form_data_isvendor'] === (int)"1") {
     <div class="row row-cols-1">
       <div class="col d-grid gap-2">
         <ul class="pagination pagination-sm">
-          <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1"><?php echo $transLang['PAGE']; ?></a></li>
+          <li class="page-item disabled"><a class="page-link" href="#" tabindex="-1"><?php echo $transLang['STR_COMMON_PAGE']; ?></a></li>
 <?php for ($i = 1; $i <= $page_count; $i++): ?>
           <li class="page-item<?php if ($i === $page_num): echo ' active'; else: echo ' '; endif; ?>"><a class="page-link" href="<?php echo $_SERVER['PHP_SELF'] . '?pnum=' . $i; ?>"><?php echo $i; ?></a></li>
 <?php endfor; ?>
@@ -389,13 +389,13 @@ if($form_data['form_data_isvendor'] === (int)"1") {
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT1']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT1_TITLE']; ?></span>
                   <input class="form-control" id="form_data_contact1" name="form_data_contact1" />
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT2']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT2_TITLE']; ?></span>
                   <input class="form-control" id="form_data_contact2" name="form_data_contact2" />
                 </div>
               </div>
@@ -403,7 +403,7 @@ if($form_data['form_data_isvendor'] === (int)"1") {
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"><?php echo $transLang['VENDORINFO-WORKSTART']; ?>&nbsp;<i class="fas fa-clock"></i></span>
+                  <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"><?php echo $transLang['STR_VENDORINFO_WORKSTART_TITLE']; ?>&nbsp;<i class="fas fa-clock"></i></span>
                   <input placeholder="" name="form_data_workstart" type="text" class="form-control bg-white datetimepicker-input datetimepicker-form_data_workstart" id="datetimepicker-form_data_workstart" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"/>
                   <script type="text/javascript">
                     $(function () {
@@ -414,7 +414,7 @@ if($form_data['form_data_isvendor'] === (int)"1") {
               </div>
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"><?php echo $transLang['VENDORINFO-WORKEND']; ?>&nbsp;<i class="fas fa-clock"></i></span>
+                  <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"><?php echo $transLang['STR_VENDORINFO_WORKEND_TITLE']; ?>&nbsp;<i class="fas fa-clock"></i></span>
                   <input placeholder="" name="form_data_workend" type="text" class="form-control bg-white datetimepicker-input datetimepicker-form_data_workend" id="datetimepicker-form_data_workend" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"/>
                   <script type="text/javascript">
                     $(function () {
@@ -445,10 +445,10 @@ if($form_data['form_data_isvendor'] === (int)"1") {
       </div>
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></button>
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['STR_COMMON_CANCEL']; ?></button>
               </div>
               <div class="col d-grid gap-2">
-                <button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
+                <button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['STR_COMMON_SAVE']; ?></button>
               </div>
             </div>
           </form>
@@ -507,14 +507,14 @@ if($form_data['form_data_isvendor'] === (int)"1") {
     <div class="modal-dialog modal-lg" role="document">
       <div class="modal-content">
         <div class="modal-header text-light bg-secondary">
-          <h5 class="modal-title" id="termsModalLongTitle"><?php echo $transLang['VENDORINFO-FORM']; ?></h5>
+          <h5 class="modal-title" id="termsModalLongTitle"><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
           <form method="post">
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
-                <p><?php echo $transLang['VENDORINFO-DOCUMENTATIONREQUIRED']; ?></p>
+                <p><?php echo $transLang['STR_VENDORINFO_DOCUMENTATIONREQUIRED_DESC']; ?></p>
               </div>
             </div>
             <div class="row row-cols-2 mb-2">
@@ -522,13 +522,13 @@ if($form_data['form_data_isvendor'] === (int)"1") {
                 <div class="input-group input-group-sm mb-0">
                   <input type="hidden" name="updateinitialvendorvisit" id="updateinitialvendorvisit" value="updateinitialvendorvisit" />
                   <input type="hidden" name="db_vendorinfo_id" id="db_vendorinfo_id" value="<?php echo $db_vendorinfo_id; ?>" />
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT1']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT1_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_contact1" name="db_vendorinfo_contact1" placeholder="<?php echo $db_vendorinfo_contact1; ?>" value="<?php echo $db_vendorinfo_contact1; ?>" disabled />
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT2']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT2_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_contact2" name="db_vendorinfo_contact2" placeholder="<?php echo $db_vendorinfo_contact2; ?>" value="<?php echo $db_vendorinfo_contact2; ?>" disabled />
                 </div>
               </div>
@@ -536,13 +536,13 @@ if($form_data['form_data_isvendor'] === (int)"1") {
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKSTART']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_WORKSTART_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_workstart" name="db_vendorinfo_workstart" placeholder="<?php echo $db_vendorinfo_workstart; ?>" value="<?php echo $db_vendorinfo_workstart; ?>" disabled />
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKEND']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_WORKEND_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_workend" name="db_vendorinfo_workend" placeholder="<?php echo $db_vendorinfo_workend; ?>" value="<?php echo $db_vendorinfo_workend; ?>" disabled />
                 </div>
               </div>
@@ -550,7 +550,7 @@ if($form_data['form_data_isvendor'] === (int)"1") {
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CUSTOMERIMPACTED']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CUSTOMERIMPACTED_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_customerimpacted" name="db_vendorinfo_customerimpacted" placeholder="<?php echo $db_vendorinfo_customerimpacted; ?>" value="<?php echo $db_vendorinfo_customerimpacted; ?>" disabled />
                 </div>
               </div>
@@ -560,14 +560,14 @@ if($form_data['form_data_isvendor'] === (int)"1") {
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_checklistrequired" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_checklistrequired" value="1" type="checkbox" id="db_vendorinfo_checklistrequired" <?php if (isset($db_vendorinfo_checklistrequired) && $db_vendorinfo_checklistrequired === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_checklistrequired"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-CHECKLISTREQUIRED-HELP']; ?>"><?php echo $transLang['VENDORINFO-CHECKLISTREQUIRED']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_checklistrequired"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_CHECKLISTREQUIRED_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_CHECKLISTREQUIRED_TITLE']; ?></span></label>
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_routinework" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_routinework" value="1" type="checkbox" id="db_vendorinfo_routinework" <?php if (isset($db_vendorinfo_routinework) && $db_vendorinfo_routinework === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_routinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-ROUTINEWORK-HELP']; ?>"><?php echo $transLang['VENDORINFO-ROUTINEWORK']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_routinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_ROUTINEWORK_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_ROUTINEWORK_TITLE']; ?></span></label>
                 </div>
               </div>
             </div>
@@ -576,21 +576,21 @@ if($form_data['form_data_isvendor'] === (int)"1") {
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_coi" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_coi" value="1" type="checkbox" id="db_vendorinfo_coi" <?php if (isset($db_vendorinfo_coi) && $db_vendorinfo_coi === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_coi"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-COI-HELP']; ?>"><?php echo $transLang['VENDORINFO-COI']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_coi"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_COI_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_COI_TITLE']; ?></span></label>
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_nonroutinework" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_nonroutinework" value="1" type="checkbox" id="db_vendorinfo_nonroutinework" <?php if (isset($db_vendorinfo_nonroutinework) && $db_vendorinfo_nonroutinework === 1) echo "checked";?>>
-                  <label class="form-check-label" for="db_vendorinfo_nonroutinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-NONROUTINEWORK-HELP']; ?>"><?php echo $transLang['VENDORINFO-NONROUTINEWORK']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_nonroutinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_NONROUTINEWORK_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_NONROUTINEWORK_TITLE']; ?></span></label>
                 </div>
               </div>
             </div>
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-WORKSUMMARY-HELP']; ?>"><span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKSUMMARY']; ?></span></span>
+                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_WORKSUMMARY_DESC']; ?>"><span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_WORKSUMMARY_TITLE']; ?></span></span>
                   <input class="form-control" id="db_vendorinfo_worksummary" name="db_vendorinfo_worksummary" placeholder="<?php echo $db_vendorinfo_worksummary; ?>" value="<?php echo $db_vendorinfo_worksummary; ?>" />
                 </div>
               </div>
@@ -598,17 +598,17 @@ if($form_data['form_data_isvendor'] === (int)"1") {
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-EQUIPMENTSUMMARY-HELP']; ?>"><span class="input-group-text"><?php echo $transLang['VENDORINFO-EQUIPMENTSUMMARY']; ?></span></span>
+                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_EQUIPMENTSUMMARY_DESC']; ?>"><span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE']; ?></span></span>
                   <input class="form-control" id="db_vendorinfo_equipmentsummary" name="db_vendorinfo_equipmentsummary" placeholder="<?php echo $db_vendorinfo_equipmentsummary; ?>" value="<?php echo $db_vendorinfo_equipmentsummary; ?>" />
                 </div>
               </div>
             </div>
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></button>
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['STR_COMMON_CANCEL']; ?></button>
               </div>
               <div class="col d-grid gap-2">
-                <button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
+                <button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['STR_COMMON_SAVE']; ?></button>
               </div>
             </div>
           </form>
@@ -645,14 +645,14 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
     <div class="modal-dialog modal-lg" role="document">
       <div class="modal-content">
         <div class="modal-header text-light bg-secondary">
-          <h5 class="modal-title" id="termsModalLongTitle"><?php echo $transLang['VENDORINFO-FORM']; ?></h5>
+          <h5 class="modal-title" id="termsModalLongTitle"><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
         </div>
         <div class="modal-body">
           <form method="post">
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
-                <p><?php echo $transLang['VENDORINFO-DOCUMENTATIONREQUIRED']; ?></p>
+                <p><?php echo $transLang['STR_VENDORINFO_DOCUMENTATIONREQUIRED_DESC']; ?></p>
               </div>
             </div>
             <div class="row row-cols-2 mb-2">
@@ -660,13 +660,13 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                 <div class="input-group input-group-sm mb-0">
                   <input type="hidden" name="updatefinalvendorvisit" id="updatefinalvendorvisit" value="updatefinalvendorvisit" />
                   <input type="hidden" name="db_vendorinfo_id" id="db_vendorinfo_id" value="<?php echo $db_vendorinfo_id; ?>" />
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT1']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT1_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_contact1" name="db_vendorinfo_contact1" placeholder="<?php echo $db_vendorinfo_contact1; ?>" value="<?php echo $db_vendorinfo_contact1; ?>" disabled />
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT2']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT2_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_contact2" name="db_vendorinfo_contact2" placeholder="<?php echo $db_vendorinfo_contact2; ?>" value="<?php echo $db_vendorinfo_contact2; ?>" disabled />
                 </div>
               </div>
@@ -674,13 +674,13 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKSTART']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_WORKSTART_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_workstart" name="db_vendorinfo_workstart" placeholder="<?php echo $db_vendorinfo_workstart; ?>" value="<?php echo $db_vendorinfo_workstart; ?>" disabled />
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKEND']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_WORKEND_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_workend" name="db_vendorinfo_workend" placeholder="<?php echo $db_vendorinfo_workend; ?>" value="<?php echo $db_vendorinfo_workend; ?>" disabled />
                 </div>
               </div>
@@ -688,7 +688,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['VENDORINFO-CUSTOMERIMPACTED']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CUSTOMERIMPACTED_TITLE']; ?></span>
                   <input class="form-control" id="db_vendorinfo_customerimpacted" name="db_vendorinfo_customerimpacted" placeholder="<?php echo $db_vendorinfo_customerimpacted; ?>" value="<?php echo $db_vendorinfo_customerimpacted; ?>" disabled />
                 </div>
               </div>
@@ -698,14 +698,14 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_checklistrequired" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_checklistrequired" value="1" type="checkbox" id="db_vendorinfo_checklistrequired" <?php if (isset($db_vendorinfo_checklistrequired) && $db_vendorinfo_checklistrequired === 1) {echo "checked";}?> disabled>
-                  <label class="form-check-label" for="db_vendorinfo_checklistrequired"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-CHECKLISTREQUIRED-HELP']; ?>"><?php echo $transLang['VENDORINFO-CHECKLISTREQUIRED']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_checklistrequired"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_CHECKLISTREQUIRED_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_CHECKLISTREQUIRED_TITLE']; ?></span></label>
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_routinework" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_routinework" value="1" type="checkbox" id="db_vendorinfo_routinework" <?php if (isset($db_vendorinfo_routinework) && $db_vendorinfo_routinework === 1) {echo "checked";}?> disabled>
-                  <label class="form-check-label" for="db_vendorinfo_routinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-ROUTINEWORK-HELP']; ?>"><?php echo $transLang['VENDORINFO-ROUTINEWORK']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_routinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_ROUTINEWORK_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_ROUTINEWORK_TITLE']; ?></span></label>
                 </div>
               </div>
             </div>
@@ -714,21 +714,21 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_coi" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_coi" value="1" type="checkbox" id="db_vendorinfo_coi" <?php if (isset($db_vendorinfo_coi) && $db_vendorinfo_coi === 1) {echo "checked";}?> disabled>
-                  <label class="form-check-label" for="db_vendorinfo_coi"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-COI-HELP']; ?>"><?php echo $transLang['VENDORINFO-COI']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_coi"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_COI_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_COI_TITLE']; ?></span></label>
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_nonroutinework" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_nonroutinework" value="1" type="checkbox" id="db_vendorinfo_nonroutinework" <?php if (isset($db_vendorinfo_nonroutinework) && $db_vendorinfo_nonroutinework === 1) {echo "checked";}?> disabled>
-                  <label class="form-check-label" for="db_vendorinfo_nonroutinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-NONROUTINEWORK-HELP']; ?>"><?php echo $transLang['VENDORINFO-NONROUTINEWORK']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_nonroutinework"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_NONROUTINEWORK_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_NONROUTINEWORK_TITLE']; ?></span></label>
                 </div>
               </div>
             </div>
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-WORKSUMMARY-HELP']; ?>"><span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKSUMMARY']; ?></span></span>
+                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_WORKSUMMARY_DESC']; ?>"><span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_WORKSUMMARY_TITLE']; ?></span></span>
                   <input class="form-control" id="db_vendorinfo_worksummary" name="db_vendorinfo_worksummary" placeholder="<?php echo $db_vendorinfo_worksummary; ?>" value="<?php echo $db_vendorinfo_worksummary; ?>" disabled />
                 </div>
               </div>
@@ -736,7 +736,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
             <div class="row row-cols-1 mb-2">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-EQUIPMENTSUMMARY-HELP']; ?>"><span class="input-group-text"><?php echo $transLang['VENDORINFO-EQUIPMENTSUMMARY']; ?></span></span>
+                  <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_EQUIPMENTSUMMARY_DESC']; ?>"><span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE']; ?></span></span>
                   <input class="form-control" id="db_vendorinfo_equipmentsummary" name="db_vendorinfo_equipmentsummary" placeholder="<?php echo $db_vendorinfo_equipmentsummary; ?>" value="<?php echo $db_vendorinfo_equipmentsummary; ?>" disabled />
                 </div>
               </div>
@@ -746,14 +746,14 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_checklistcompleted" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_checklistcompleted" value="1" type="checkbox" id="db_vendorinfo_checklistcompleted" <?php if (isset($db_vendorinfo_checklistcompleted) && $db_vendorinfo_checklistcompleted === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_checklistcompleted"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-CHECKLISTCOMPLETED-HELP']; ?>"><?php echo $transLang['VENDORINFO-CHECKLISTCOMPLETED']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_checklistcompleted"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_CHECKLISTCOMPLETED_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_CHECKLISTCOMPLETED_TITLE']; ?></span></label>
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_workcompleted" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_workcompleted" value="1" type="checkbox" id="db_vendorinfo_workcompleted" <?php if (isset($db_vendorinfo_workcompleted) && $db_vendorinfo_workcompleted === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_workcompleted"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-WORKCOMPLETED-HELP']; ?>"><?php echo $transLang['VENDORINFO-WORKCOMPLETED']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_workcompleted"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_WORKCOMPLETED_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_WORKCOMPLETED_TITLE']; ?></span></label>
                 </div>
               </div>
             </div>
@@ -762,23 +762,23 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_sitecleanup" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_sitecleanup" value="1" type="checkbox" id="db_vendorinfo_sitecleanup" <?php if (isset($db_vendorinfo_sitecleanup) && $db_vendorinfo_sitecleanup === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_sitecleanup"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-SITECLEANUP-HELP']; ?>"><?php echo $transLang['VENDORINFO-SITECLEANUP']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_sitecleanup"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_SITECLEANUP_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_SITECLEANUP_TITLE']; ?></span></label>
                 </div>
               </div>
               <div class="col d-grid gap-2">
                 <div class="form-check form-switch">
                   <input type="hidden" name="db_vendorinfo_doccompleted" value="0" />
                   <input class="form-check-input" name="db_vendorinfo_doccompleted" value="1" type="checkbox" id="db_vendorinfo_doccompleted" <?php if (isset($db_vendorinfo_doccompleted) && $db_vendorinfo_doccompleted === 1) {echo "checked";}?>>
-                  <label class="form-check-label" for="db_vendorinfo_doccompleted"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-DOCCOMPLETED-HELP']; ?>"><?php echo $transLang['VENDORINFO-DOCCOMPLETED']; ?></span></label>
+                  <label class="form-check-label" for="db_vendorinfo_doccompleted"><span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_DOCCOMPLETED_DESC']; ?>"><?php echo $transLang['STR_VENDORINFO_DOCCOMPLETED_TITLE']; ?></span></label>
                 </div>
               </div>
             </div>
             <div class="row row-cols-2 mb-2">
               <div class="col d-grid gap-2">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></button>
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['STR_COMMON_CANCEL']; ?></button>
               </div>
               <div class="col d-grid gap-2">
-                <button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
+                <button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['STR_COMMON_SAVE']; ?></button>
               </div>
             </div>
           </form>
@@ -841,11 +841,11 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
 <?php if($isvendor===1) { ?>
                   <div class="input-group input-group-sm mb-0">
 <?php if ($finalvendorformcomplete===1) { ?>
-                    <span class="badge bg-success text-dark"><?php echo $transLang['TAGS-FORMCOMPLETE']; ?></span>&nbsp;
+                    <span class="badge bg-success text-dark"><?php echo $transLang['STR_TAGS_FORMCOMPLETE_TITLE']; ?></span>&nbsp;
 <?php } else { ?>
-                    <span class="badge bg-info text-dark"><?php echo $transLang['TAGS-FORMINCOMPLETE']; ?></span>&nbsp;
+                    <span class="badge bg-info text-dark"><?php echo $transLang['STR_TAGS_FORMINCOMPLETE_TITLE']; ?></span>&nbsp;
 <?php } ?>                   
-                  <a data-bs-toggle="modal" data-bs-target="#vendorFinalModal-<?php echo $visitid; ?>" data-id="<?php echo $visitid; ?>" href="#vendorFinalModal-<?php echo $visitid; ?>" name="vendorFinalModal-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="open-vendorFinalModal-<?php echo $visitid; ?>"><?php echo $transLang['VENDORINFO-FORM']; ?></a>
+                  <a data-bs-toggle="modal" data-bs-target="#vendorFinalModal-<?php echo $visitid; ?>" data-id="<?php echo $visitid; ?>" href="#vendorFinalModal-<?php echo $visitid; ?>" name="vendorFinalModal-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="open-vendorFinalModal-<?php echo $visitid; ?>"><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></a>
                   </div>
 <?php } ?>
                 </td>
@@ -875,11 +875,11 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     <option value="<?php echo $row['idtypes_id']; ?>"><?php echo $transLang[$row['idtypes_name']]; ?></option>
 <?php endforeach; ?>
                   </select>
-                  <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+                  <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
                 </div>
                 <div id="ticket-<?php echo $visitid; ?>" name="ticket-<?php echo $visitid; ?>" class="input-group input-group-sm mb-0"><span class="input-group-text"><?php echo $transLang['TICKET']; ?></span>
                   <input class="form-control form-control-sm bg-white<?php if( isset($id_reference_error) && $id_reference_error === 1 && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" type="text" id="id_reference-<?php echo $visitid; ?>" name="id_reference">
-                  <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+                  <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
                 </div>
                 <script type="text/javascript">
                   $('#id_type-<?php echo $visitid; ?>').change(function() {
@@ -904,10 +904,10 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     <option value="<?php echo $row['countries_id']; ?>" data-sanctioned="<?php echo $row['countries_ban']; ?>"><?php echo $row['countries_name']; ?></option>
 <?php } ?>
                   </select>
-                  <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+                  <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
                 </div>
                 <div id="citizen-ban-<?php echo $visitid; ?>" name="ban-<?php echo $visitid; ?>" class="input-group input-group-sm mb-0">
-                  <span class="badge bg-danger"><?php echo $transLang['SANCTIONED']; ?></span>
+                  <span class="badge bg-danger"><?php echo $transLang['STR_COMMON_SANCTIONED']; ?></span>
                 </div>
                 <script type="text/javascript">
                   $('#citizen-<?php echo $visitid; ?>').change(function() {
@@ -928,16 +928,16 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                   <div class="input-group input-group-sm mb-0">
                     <span class="input-group-text"><?php echo $transLang['BADGE']; ?></span>
                     <input type="text" id="badge" name="badge" class="form-control form-control-sm bg-white<?php if( isset($badge_error) && $badge_error===1 && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" autofocus maxlength="15">
-                    <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+                    <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
                   </div>
 <?php if($isvendor===1) { ?>
                   <div class="input-group input-group-sm mb-0">
 <?php if ($initialvendorformcomplete===1) { ?>
-                    <span class="badge bg-success text-dark"><?php echo $transLang['TAGS-FORMCOMPLETE']; ?></span>&nbsp;
+                    <span class="badge bg-success text-dark"><?php echo $transLang['STR_TAGS_FORMCOMPLETE_TITLE']; ?></span>&nbsp;
 <?php } else { ?>
-                    <span class="badge bg-info text-dark"><?php echo $transLang['TAGS-FORMINCOMPLETE']; ?></span>&nbsp;
+                    <span class="badge bg-info text-dark"><?php echo $transLang['STR_TAGS_FORMINCOMPLETE_TITLE']; ?></span>&nbsp;
 <?php } ?>
-                    <a data-bs-toggle="modal" data-bs-target="#vendorModal-<?php echo $visitid; ?>" data-id="<?php echo $visitid; ?>" href="#vendorModal-<?php echo $visitid; ?>" name="vendorModal-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="open-vendorModal-<?php echo $visitid; ?>"><?php echo $transLang['VENDORINFO-FORM']; ?></a>
+                    <a data-bs-toggle="modal" data-bs-target="#vendorModal-<?php echo $visitid; ?>" data-id="<?php echo $visitid; ?>" href="#vendorModal-<?php echo $visitid; ?>" name="vendorModal-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="open-vendorModal-<?php echo $visitid; ?>"><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></a>
                   </div>
                     
                     
@@ -949,7 +949,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
 <?php } ?>
                 <td class="small">
                   <div class="input-group input-group-sm mb-0 d-grid gap-2">
-                    <button type="submit" name="approvevisit" id="approvevisit-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="btn btn-success btn-block btn-sm <?php if ($isvendor===1 && $initialvendorformcomplete===0) { echo "disabled"; }; ?>"><i class="fas fa-thumbs-up"></i>&nbsp;<?php echo $transLang['APPROVE']; ?></button>
+                    <button type="submit" name="approvevisit" id="approvevisit-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="btn btn-success btn-block btn-sm <?php if ($isvendor===1 && $initialvendorformcomplete===0) { echo "disabled"; }; ?>"><i class="fas fa-thumbs-up"></i>&nbsp;<?php echo $transLang['STR_COMMON_APPROVE']; ?></button>
                   </div>
                   <div class="input-group input-group-sm mb-0 d-grid gap-2">
                     <a data-bs-toggle="modal" data-bs-target="#voidModal" data-id="<?php echo $visitid; ?>" href="#voidModal" name="voidvisit" value="<?php echo $visitid; ?>" class="btn btn-danger btn-block btn-sm open-voidModal"><i class="fas fa-thumbs-down"></i>&nbsp;<?php echo $transLang['DECLINE']; ?></a>
diff --git a/login.php b/login.php
index 05258df..59cac15 100644
--- a/login.php
+++ b/login.php
@@ -114,12 +114,12 @@ endif;
   <div class="container">
     <div class="row row-cols-2">
       <div class="col d-grid gap-2">
-        <p><b><?php echo $transLang['SITE']; ?>:</b> <?php echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_name"]; ?>
-          <br><b><?php echo $transLang['TIMEZONE']; ?>:</b> <?php echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_timezone"]; ?>
-          <br><b><?php echo $transLang['REGION']; ?>:</b> <?php echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"]; ?></p>
+        <p><b><?php echo $transLang['STR_COMMON_SITE']; ?>:</b> <?php echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_name"]; ?>
+          <br><b><?php echo $transLang['STR_COMMON_TIMEZONE']; ?>:</b> <?php echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_timezone"]; ?>
+          <br><b><?php echo $transLang['STR_COMMON_REGION']; ?>:</b> <?php echo $SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"]; ?></p>
       </div>
       <div class="col d-grid gap-2">
-        <button type="button" class="btn btn-block btn-lg btn-success" data-bs-toggle="modal" data-bs-target="#sitetimeModal"><?php echo $transLang['CHANGE']; ?></button>
+        <button type="button" class="btn btn-block btn-lg btn-success" data-bs-toggle="modal" data-bs-target="#sitetimeModal"><?php echo $transLang['STR_COMMON_CHANGE']; ?></button>
       </div>
     </div>
     <br />
diff --git a/printvwf.php b/printvwf.php
new file mode 100644
index 0000000..f8e7a5f
--- /dev/null
+++ b/printvwf.php
@@ -0,0 +1,247 @@
+<?php
+/*
+ * Copyright (C) 2018 josh.north@point808.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+    ini_set('session.gc_maxlifetime', 24*60*60);                                // MIN SESSION
+    ini_set('session.gc_probability', 1);                                       // GC RATES
+    ini_set('session.gc_divisor', 100);                                         // TIMES
+    ini_set('session.use_cookies', '1');
+    ini_set('session.use_only_cookies', '1');
+    ini_set('session.cookie_secure', '0');
+    ini_set('session.cookie_httponly', '0');
+    ini_set('session.cookie_samesite', 'Lax');
+    session_save_path('.tmp');                                                  // TEMP
+    session_start();                                                            // START
+    require_once __DIR__ . '/autoload.php';                                     // AUTOLOAD
+    use App\LobbySIO\Config\Registry;
+    $Users = new \App\LobbySIO\Database\Users();
+    if (Registry::AUTHMETHOD == 'SAML') {
+        //simplesaml
+        require_once('../simplesamlphp/lib/_autoload.php');
+        $auth = new \SimpleSAML\Auth\Simple(Registry::AUTHIDP);
+        //$auth->requireAuth();
+        $auth->isAuthenticated();
+        if (!$auth->isAuthenticated()) {
+            $attributes = 'none';
+        } else {
+            $attributes = $auth->getAttributes();
+            $saml_user_email = $attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0];
+            $saml_user_info = $Users->getUserInfoByEmail($saml_user_email, "1", "0");
+            $saml_user_id = $saml_user_info["0"]["users_id"];
+        }
+        $session = \SimpleSAML\Session::getSessionFromRequest();
+        $session->cleanup();
+    }
+    $StaticFunctions = new \App\LobbySIO\Misc\StaticFunctions();                // DEFAULT CLASSES
+    $SiteInfo = new \App\LobbySIO\Database\SiteInfo();
+    if (isset($_SESSION['user_id'])) {                                          // LOGGED IN? GET USER OBJECT
+        if (isset($saml_user_id)) {
+            $sessuserid=$saml_user_id;
+        } else {
+            $sessuserid=$_SESSION['user_id'];
+        }
+        } elseif (!isset($_SESSION['user_id'])) {
+        if (isset($saml_user_id)) {
+            $sessuserid=$saml_user_id;
+        } else {
+            $sessuserid='2';
+        }
+    $session_user = $Users->getUserInfo($sessuserid, "1", "0"); }
+    if (isset($session_user)) {                                                 // GET UID OR SET TO KIOSK
+        $uid = $session_user["0"]["users_id"];} else { $uid = "2"; }
+    $app_disp_lang = filter_input(INPUT_COOKIE, 'app_disp_lang');               // SETUP LANGUAGE
+    if(!isset($app_disp_lang)) {
+        $app_disp_lang=$StaticFunctions->getDefaultLanguage(); }
+    $siteidcookie = filter_input(INPUT_COOKIE, 'app_site');                     // SETUP SITE
+    foreach($SiteInfo->getSite("0", $uid, "0", "0") as $arr) {
+        $lookup_array[$arr['sites_id']]=1; }
+        if(isset($lookup_array[$siteidcookie])) {
+            $siteid = $siteidcookie; } else { $siteid = "1"; }
+        if(!isset($siteid)) { $siteid="1"; }
+    $Translate = new \App\LobbySIO\Language\Translate($app_disp_lang);          // SETUP TRANSLATOR
+    $transLang =  $Translate->userLanguage();
+    $defaulttimezone = $StaticFunctions->getDefaultTZ();
+    date_default_timezone_set('UTC');                                           // DEFAULT TO UTC
+    date_default_timezone_set($defaulttimezone);                                // UPDATE TO DEFAULT APP SETTING
+    $timezone = $SiteInfo->getSite($siteid, "0", "0", "0")[0]["sites_timezone"]; // GET TIMEZONE FROM SITE ID
+    $timeplus = new DateTime($StaticFunctions->getUTC(), new DateTimeZone('UTC')); // DUMB WAY TO CALCULATE SOME TIMES
+    $timeplus->setTimezone(new DateTimeZone("$timezone"));
+    $timenow = $timeplus->format('Y-m-d H:i:s');
+    $app_current_pagename = $transLang['ACCOUNT'];                              // PAGE SETUP
+    $app_current_pageicon = '<i class="fas fa-user-circle"></i> ';
+//    require_once("inc/header.inc.php");
+    if ($StaticFunctions->getUserSessionStatus() == false) {                        // CHECK STATUS
+        echo $StaticFunctions->killSession();                                   // ELSE DIE
+    } else { ?>
+
+
+<!-- START CONTENT -->
+<!doctype html>
+<html lang="<?php echo $app_disp_lang; ?>">
+<!-- START HEAD -->
+<head>
+  <meta charset="utf-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
+  <link rel="manifest" href="manifest.webmanifest">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-title" content="<?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?>">
+  <link rel="apple-touch-icon" href="assets/touch-logo.png?v3">
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+<?php if (basename($_SERVER['PHP_SELF']) == 'signin_display.php'): ?>  <meta http-equiv="refresh" content="5; url=index.php" /><?php endif; ?>
+<?php if (basename($_SERVER['PHP_SELF']) == 'signout.php'): ?><?php if (!empty($_POST['endvisit'])): ?>  <meta http-equiv="refresh" content="5; url=index.php" /><?php endif; ?><?php endif; ?>
+  <link rel="stylesheet" href="css/bootstrap.min.css?v3"/>
+  <link rel="stylesheet" href="css/sticky-footer-navbar.css?v3">
+  <link rel="stylesheet" href="css/all.min.css?v3"/>
+  <link rel="stylesheet" href="css/fontawesome.min.css?v3"/>
+  <link rel="stylesheet" href="css/brands.min.css?v3"/>
+  <link rel="stylesheet" href="css/regular.min.css?v3"/>
+  <link rel="stylesheet" href="css/animate.min.css?v3"/>
+  <link rel="stylesheet" href="css/datatables.min.css?v3" />
+  <link rel="stylesheet" href="css/styles.css?v3"/>
+  <link rel="stylesheet" href="css/tempusdominus-bootstrap-4.min.css?v3"/>
+  <meta name="description" content="<?php echo $transLang['META_DESC']; ?>" />
+  <script src="js/jquery.min.js?v3"></script>
+  <script src="js/bootstrap.bundle.min.js?v3"></script>
+  <script src="js/datatables.min.js?v3"></script>
+  <script src="js/buttons.flash.min.js?v3"></script>
+  <script src="js/buttons.html5.min.js?v3"></script>
+  <script src="js/buttons.print.min.js?v3"></script>
+  <script src="js/dataTables.buttons.min.js?v3"></script>
+  <script src="js/jszip.min.js?v3"></script>
+  <script src="js/pdfmake.min.js?v3"></script>
+  <script src="js/vfs_fonts.js?v3"></script>
+  <script src="js/moment.min.js?v3"></script>
+  <script src="js/tempusdominus-bootstrap-4.min.js?v3"></script>
+  <script src="js/jSignature.min.js?v3"></script>
+  <title><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></title>
+</head>
+<!-- END HEAD -->
+<!-- START BODY -->
+<body>
+
+<?php
+$form_data = filter_input_array(INPUT_POST, [
+    'form_data_stage' => (string)FILTER_SANITIZE_STRING,
+    'form_data_sitename' => (string)FILTER_SANITIZE_STRING,
+    'form_data_timein' => (string)FILTER_SANITIZE_STRING,
+    'form_data_timeout' => (string)FILTER_SANITIZE_STRING,
+    'form_data_isvendor' => (int)FILTER_VALIDATE_INT,
+    'form_data_badge' => (int)FILTER_VALIDATE_INT,
+    'form_data_manualsignindate' => (string)FILTER_SANITIZE_STRING,
+    'form_data_firstname' => (string)FILTER_SANITIZE_STRING,
+    'form_data_idtypename' => (string)FILTER_SANITIZE_STRING,
+    'form_data_lastname' => (string)FILTER_SANITIZE_STRING,
+    'form_data_country' => (string)FILTER_SANITIZE_STRING,
+    'form_data_carnum' => (string)FILTER_SANITIZE_STRING,
+    'form_data_ssanum' => (string)FILTER_SANITIZE_STRING,
+    'form_data_company' => (string)FILTER_SANITIZE_STRING,
+    'form_data_contact1' => (string)FILTER_SANITIZE_STRING,
+    'form_data_contact2' => (string)FILTER_SANITIZE_STRING,
+    'form_data_workstart' => (string)FILTER_SANITIZE_STRING,
+    'form_data_workend' => (string)FILTER_SANITIZE_STRING,
+    'form_data_visittype' => (int)FILTER_VALIDATE_INT,
+    'form_data_escortrequired' => (int)FILTER_VALIDATE_INT,
+    'form_data_v_signature' => (string)FILTER_SANITIZE_STRING,
+    'form_data_e_signature' => (string)FILTER_SANITIZE_STRING,
+    'form_data_escortname' => (string)FILTER_SANITIZE_STRING
+]);          
+?>
+
+  <div class="container">
+    <div class="row row-cols-1">
+      <div class="col d-grid gap-2">
+        <h2><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></h2>
+      </div>
+    </div>
+    <div class="row row-cols-2">
+
+
+
+
+      <div class="col d-grid gap-2">
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['SITE']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_sitename']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['NAME']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_lastname'] . ", " . $form_data['form_data_firstname']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['CARNUM']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_carnum']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['LOCAL_TIME'] . " " . $transLang['IN']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_timein']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['COUNTRY']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_country']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['BADGE']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_badge']; ?></dd>
+        </dl>
+      </div>
+
+      
+      
+      <div class="col d-grid gap-2">
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['PRINT']; ?></dt>
+          <dd class="col-sm-9"><?php echo $timenow; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['COMPANY']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_company']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['SSANUM']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_ssanum']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['LOCAL_TIME'] . " " . $transLang['OUT']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_timeout']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['ID_TYPE']; ?></dt>
+          <dd class="col-sm-9"><?php echo $form_data['form_data_idtypename']; ?></dd>
+        </dl>
+        <dl class="row">
+          <dt class="col-sm-3"><?php echo $transLang['SIGNATURE']; ?></dt>
+          <dd class="col-sm-9"><img src="<?php echo $form_data['form_data_v_signature']; ?>" width="200" height="50"/></dd>
+        </dl>
+      </div>
+
+
+
+    </div>
+
+
+
+
+
+
+
+
+  </div>
+  
+
+
+
+    <?php } 
diff --git a/profile.php b/profile.php
index 3817939..d57213a 100644
--- a/profile.php
+++ b/profile.php
@@ -166,13 +166,13 @@
           </div>
           <div class="col">
             <div class="input-group input-group-sm mb-0">
-              <span class="input-group-text bg-info text-dark"><?php echo $transLang['CONFIRM'] . " " . $transLang['NEW'] . " " . $transLang['PASSWORD']; ?></span>
+              <span class="input-group-text bg-info text-dark"><?php echo $transLang['STR_COMMON_CONFIRM'] . " " . $transLang['NEW'] . " " . $transLang['PASSWORD']; ?></span>
               <input class="form-control" type="password" name="newpassword2" id="newpassword2" />
             </div>
           </div>
           <div class="col d-grid gap-2">
             <div class="input-group input-group-sm mb-0">
-              <button type="submit" name="saveprofile" id="saveprofile" class="form-control btn btn-primary"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
+              <button type="submit" name="saveprofile" id="saveprofile" class="form-control btn btn-primary"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['STR_COMMON_SAVE']; ?></button>
             </div>
           </div>
         </div>
diff --git a/reports.php b/reports.php
index cbb9d52..8d3de8c 100644
--- a/reports.php
+++ b/reports.php
@@ -111,11 +111,11 @@
         </div>
         <div class="col d-grid gap-2">
           <div class="input-group input-group-sm mb-0">
-            <span class="input-group-text" id="basic-addon3"><?php echo $transLang['SITE']; ?>:</span>
+            <span class="input-group-text" id="basic-addon3"><?php echo $transLang['STR_COMMON_SITE']; ?>:</span>
 <?php if (isset($_POST['repsite'])) { $currentrepsite = $_POST['repsite']; } else { $currentrepsite = "0"; }; ?>
             <select name="repsite" class="form-control form-control-lg">
 <?php if($session_user["0"]["users_usertype"] == "USER-TYPES-ADMIN") { ?>
-              <option value="all"<?php if ($currentrepsite == "all") {echo " selected";}; ?>><?php echo $transLang['ALL']; ?></option>
+              <option value="all"<?php if ($currentrepsite == "all") {echo " selected";}; ?>><?php echo $transLang['STR_COMMON_ALL']; ?></option>
 <?php } ?>
 <?php foreach($SiteInfo->getSite("0", $uid, "0", "0") as $row): ?>
               <option value="<?php echo $row['sites_id']; ?>"<?php if ($currentrepsite == $row['sites_id']) {echo " selected";}; ?>><?php echo $row['sites_name']; ?></option>
@@ -127,7 +127,7 @@
       <div class="row row-cols-2">
         <div class="col d-grid gap-2">
           <div class="input-group input-group-sm mb-0">
-            <span class="input-group-text date" id="datetimepicker-1" data-target-input="#datetimepicker-1" data-target=".datetimepicker-1" data-toggle="datetimepicker"><i class="fas fa-calendar"></i>&nbsp <?php echo $transLang['START']; ?></span>
+            <span class="input-group-text date" id="datetimepicker-1" data-target-input="#datetimepicker-1" data-target=".datetimepicker-1" data-toggle="datetimepicker"><i class="fas fa-calendar"></i>&nbsp <?php echo $transLang['STR_COMMON_START']; ?></span>
             <input name="starttime" type="text" class="datetimepicker-input form-control form-control-lg datetimepicker-1" id="datetimepicker-1" data-target=".datetimepicker-1" autocomplete="new-password" required />
           </div>
         </div>
@@ -150,7 +150,7 @@
       </div>
       <div class="row row-cols-1">
         <div class="col d-grid gap-2">
-          <button type="submit" class="form-control form-control-lg btn btn-lg btn-primary"><i class="fas fa-play"></i>&nbsp;<?php echo $transLang['REPORT-EXECUTE']; ?></button>
+          <button type="submit" class="form-control form-control-lg btn btn-lg btn-primary"><i class="fas fa-play"></i>&nbsp;<?php echo $transLang['STR_REPORT_EXECUTE_TITLE']; ?></button>
         </div>
       </div>
     </form>
@@ -159,7 +159,7 @@
         <?php if ($_POST['reporttype'] == "Default"): ?>
         <div class="container-fluid">
             <table id="report" class="table table-striped table-bordered table-sm table-responsive-sm text-nowrap">
-                <thead><tr><th><?php echo $transLang['IN']; ?></th><th><?php echo $transLang['OUT']; ?></th><th><?php echo $transLang['SITE']; ?></th><th><?php echo $transLang['COMPANY']; ?></th><th><?php echo $transLang['REASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['ESCORT']; ?></th><th><?php echo $transLang['BADGE']; ?></th><th><?php echo $transLang['SIGNINBY']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th><?php echo $transLang['CARNUM']; ?></th><th><?php echo $transLang['SSANUM']; ?></th><?php } ?><?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?><th><?php echo $transLang['CITIZEN']; ?></th><?php } ?><th><?php echo $transLang['ID_TYPE']; ?></th><th><?php echo $transLang['TICKET']; ?></th><th><?php echo $transLang['DECLINE']; ?></th></tr></thead>
+                <thead><tr><th><?php echo $transLang['IN']; ?></th><th><?php echo $transLang['OUT']; ?></th><th><?php echo $transLang['STR_COMMON_SITE']; ?></th><th><?php echo $transLang['COMPANY']; ?></th><th><?php echo $transLang['REASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['ESCORT']; ?></th><th><?php echo $transLang['BADGE']; ?></th><th><?php echo $transLang['SIGNINBY']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th><?php echo $transLang['CARNUM']; ?></th><th><?php echo $transLang['SSANUM']; ?></th><?php } ?><?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?><th><?php echo $transLang['CITIZEN']; ?></th><?php } ?><th><?php echo $transLang['ID_TYPE']; ?></th><th><?php echo $transLang['TICKET']; ?></th><th><?php echo $transLang['DECLINE']; ?></th></tr></thead>
                 <tbody>
                     <?php
                         $approval = "2";
@@ -203,7 +203,7 @@
         <?php if ($_POST['reporttype'] == "Vendors"): ?>
         <div class="container-fluid">
             <table id="report" class="table table-striped table-bordered table-sm table-responsive-sm text-nowrap">
-              <thead><tr><th><?php echo $transLang['IN']; ?></th><th><?php echo $transLang['OUT']; ?></th><th><?php echo $transLang['SITE']; ?></th><th><?php echo $transLang['COMPANY']; ?></th><th><?php echo $transLang['REASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['BADGE']; ?></th><th><?php echo $transLang['SIGNINBY']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th><?php echo $transLang['CARNUM']; ?></th><th><?php echo $transLang['SSANUM']; ?></th><?php } ?><?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?><th><?php echo $transLang['CITIZEN']; ?></th><?php } ?><th><?php echo $transLang['ID_TYPE']; ?></th><th><?php echo $transLang['TICKET']; ?></th><th><?php echo $transLang['DECLINE']; ?></th></tr></thead>
+                <thead><tr><th><?php echo $transLang['IN']; ?></th><th><?php echo $transLang['OUT']; ?></th><th><?php echo $transLang['STR_COMMON_SITE']; ?></th><th><?php echo $transLang['COMPANY']; ?></th><th><?php echo $transLang['REASON']; ?></th><th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['BADGE']; ?></th><th><?php echo $transLang['SIGNINBY']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th><?php echo $transLang['CARNUM']; ?></th><th><?php echo $transLang['SSANUM']; ?></th><?php } ?><?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?><th><?php echo $transLang['CITIZEN']; ?></th><?php } ?><th><?php echo $transLang['ID_TYPE']; ?></th><th><?php echo $transLang['TICKET']; ?></th><th><?php echo $transLang['DECLINE']; ?></th><th><?php echo $transLang['STR_VENDORINFO_FORM_TITLE']; ?></th></tr></thead>
                 <tbody>
                     <?php
                         $approval = "2";
@@ -219,6 +219,25 @@
                         if(!empty($row['visits_ssanum'])) { $ssanum=$row['visits_ssanum']; } else { $ssanum="";}
                         if ($row['visits_isvendor']===1) {
                     ?>
+                    <tr>
+                        <td><?php echo $timein_disp; ?></td>
+                        <td><?php if (!empty($row['visits_outtime'])) {echo $timeout_disp; } else {echo $transLang['IN'];} ?></td>
+                        <td><?php echo $SiteInfo->getSite($row['visits_site_id'], $uid, "0", "0")[0]["sites_name"]; ?></td>
+                        <td><?php echo $row['visits_company']; ?></td>
+                        <td><?php echo $transLang[$VisitTypeInfo->getInfoVisitType("%", $row['visits_reason'])[0]['visittypes_name']]; ?></td>
+                        <td><?php echo $row['visits_lastname'] . ", " . $row['visits_firstname']; ?><br /><img src="<?php echo $row['visits_signature']; ?>" width="200" height="50" alt="Signature" /></td>
+                        <td><?php echo $row['visits_badge']; ?></td>
+                        <td><?php echo $Users->readUserFirstAndLast($row['visits_initials'])[0]["users_firstname"] . " " . $Users->readUserFirstAndLast($row['visits_initials'])[0]["users_lastname"]; ?></td>
+<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
+                                <td><?php echo $carnum; ?></td>
+                                <td><?php echo $ssanum; ?></td>
+<?php } ?>
+<?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?>                        <td><?php echo $row['visits_citizen']; ?></td>  <?php } ?>
+                        <td><?php echo $transLang[$IDTypeInfo->getIDTypeInfo($row['visits_id_type'])[0]['idtypes_name']]; ?></td>
+                        <td><?php echo $row['visits_id_reference']; ?></td>
+                        <td><?php echo $row['visits_notes']; ?></td>
+
+                        <td>
 <?php foreach ($VisitInfo->getInfoVendorVisitFinal($row['visits_id']) as $vnrow) { 
 $db_vendorinfo_id = $vnrow['db_vendorinfo_id'];
 $db_vendorinfo_contact1 = $vnrow['db_vendorinfo_contact1'];
@@ -235,53 +254,57 @@ $db_vendorinfo_checklistcompleted = $vnrow['db_vendorinfo_checklistcompleted'];
 $db_vendorinfo_workcompleted = $vnrow['db_vendorinfo_workcompleted'];
 $db_vendorinfo_sitecleanup = $vnrow['db_vendorinfo_sitecleanup'];
 $db_vendorinfo_doccompleted = $vnrow['db_vendorinfo_doccompleted'];
-?> 
-                    <tr>
-                        <td rowspan="3"><?php echo $timein_disp; ?></td>
-                        <td rowspan="3"><?php if (!empty($row['visits_outtime'])) {echo $timeout_disp; } else {echo $transLang['IN'];} ?></td>
-                        <td><?php echo $SiteInfo->getSite($row['visits_site_id'], $uid, "0", "0")[0]["sites_name"]; ?></td>
-                        <td><?php echo $row['visits_company']; ?></td>
-                        <td><?php echo $transLang[$VisitTypeInfo->getInfoVisitType("%", $row['visits_reason'])[0]['visittypes_name']]; ?></td>
-                        <td><?php echo $row['visits_lastname'] . ", " . $row['visits_firstname']; ?><br /><img src="<?php echo $row['visits_signature']; ?>" width="200" height="50" alt="Signature" /></td>
-                        <td><?php echo $row['visits_badge']; ?></td>
-                        <td><?php echo $Users->readUserFirstAndLast($row['visits_initials'])[0]["users_firstname"] . " " . $Users->readUserFirstAndLast($row['visits_initials'])[0]["users_lastname"]; ?></td>
-<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
-                                <td><?php echo $carnum; ?></td>
-                                <td><?php echo $ssanum; ?></td>
-<?php } ?>
-<?php if($SiteInfo->getSite($_POST['repsite'], $uid, "0", "0")[0]["sites_region"] == "US") { ?>                        <td><?php echo $row['visits_citizen']; ?></td>  <?php } ?>
-                        <td><?php if(isset($row['visits_id_type'])){echo $transLang[$IDTypeInfo->getIDTypeInfo($row['visits_id_type'])[0]['idtypes_name']];} ?></td>
-                        <td><?php echo $row['visits_id_reference']; ?></td>
-                        <td><?php echo $row['visits_notes']; ?></td>
-                    </tr>
-                    <tr>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-CONTACT1']; ?>:&nbsp;<?php echo $db_vendorinfo_contact1; ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-CONTACT2']; ?>:&nbsp;<?php echo $db_vendorinfo_contact2; ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-WORKSTART']; ?>:&nbsp;<?php echo $db_vendorinfo_workstart; ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-WORKEND']; ?>:&nbsp;<?php echo $db_vendorinfo_workend; ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-CHECKLISTREQUIRED']; ?>:&nbsp;<?php if($db_vendorinfo_checklistrequired===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_checklistrequired===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-ROUTINEWORK']; ?>:&nbsp;<?php if($db_vendorinfo_routinework===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_routinework===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-NONROUTINEWORK']; ?>:&nbsp;<?php if($db_vendorinfo_nonroutinework===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_nonroutinework===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-COI']; ?>:&nbsp;<?php if($db_vendorinfo_coi===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_coi===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-WORKSUMMARY']; ?>:&nbsp;<?php echo $db_vendorinfo_worksummary; ?></td>
-                    </tr>
-                    <tr>
-                      <td class="text-muted">&nbsp;</td>
-                      <td class="text-muted">&nbsp;</td>
-                      <td class="text-muted">&nbsp;</td>
-                      <td class="text-muted">&nbsp;</td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-CHECKLISTCOMPLETED']; ?>:&nbsp;<?php if($db_vendorinfo_checklistcompleted===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_checklistcompleted===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-WORKCOMPLETED']; ?>:&nbsp;<?php if($db_vendorinfo_workcompleted===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_workcompleted===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-SITECLEANUP']; ?>:&nbsp;<?php if($db_vendorinfo_sitecleanup===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_sitecleanup===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-DOCCOMPLETED']; ?>:&nbsp;<?php if($db_vendorinfo_doccompleted===0){echo $transLang['COMMON-NO'];}elseif($db_vendorinfo_doccompleted===1){echo $transLang['COMMON-YES'];} ?></td>
-                        <td class="text-muted"><?php echo $transLang['VENDORINFO-EQUIPMENTSUMMARY']; ?>:&nbsp;<?php echo $db_vendorinfo_equipmentsummary; ?></td>
+$db_vendorinfo_approverid = $vnrow['db_vendorinfo_approverid'];
+?>
+                          
 
-<?php }; ?>
-                        
-                        
-                    </tr>
-                        <?php }; ?>
-                    <?php endforeach; ?>
+        <form action="printvwf.php" method="post" target="_blank">
+
+          <input type="hidden" name="form_data_timein" id="form_data_timein" value="<?php echo $timein_disp; ?>" />
+          <input type="hidden" name="form_data_timeout" id="form_data_timeout" value="<?php if (!empty($row['visits_outtime'])) {echo $timeout_disp; } else {echo $transLang['IN'];} ?>" />
+          <input type="hidden" name="form_data_sitename" id="form_data_sitename" value="<?php echo $SiteInfo->getSite($row['visits_site_id'], $uid, "0", "0")[0]["sites_name"]; ?>" />
+          <input type="hidden" name="form_data_firstname" id="form_data_firstname" value="<?php echo $row['visits_firstname']; ?>" />
+          <input type="hidden" name="form_data_lastname" id="form_data_lastname" value="<?php echo $row['visits_lastname']; ?>" />
+          <input type="hidden" name="form_data_carnum" id="form_data_carnum" value="<?php echo $form_data['form_data_carnum']; ?>" />
+          <input type="hidden" name="form_data_ssanum" id="form_data_ssanum" value="<?php echo $form_data['form_data_ssanum']; ?>" />
+          <input type="hidden" name="form_data_company" id="form_data_company" value="<?php echo $row['visits_company']; ?>" />
+          <input type="hidden" name="form_data_contact1" id="form_data_contact1" value="<?php echo $db_vendorinfo_contact1; ?>" />
+          <input type="hidden" name="form_data_contact2" id="form_data_contact2" value="<?php echo $db_vendorinfo_contact2; ?>" />
+          <input type="hidden" name="form_data_workstart" id="form_data_workstart" value="<?php echo $db_vendorinfo_workstart; ?>" />
+          <input type="hidden" name="form_data_workend" id="form_data_workend" value="<?php echo $db_vendorinfo_workend; ?>" />
+          <input type="hidden" name="form_data_customerimpacted" id="form_data_customerimpacted" value="<?php echo $form_data['form_data_customerimpacted']; ?>" />
+          <input type="hidden" name="form_data_reason" id="form_data_reason" value="<?php echo $transLang[$VisitTypeInfo->getInfoVisitType("%", $row['visits_reason'])[0]['visittypes_name']]; ?>" />
+          <input type="hidden" name="form_data_idtypename" id="form_data_idtypename" value="<?php echo $transLang[$IDTypeInfo->getIDTypeInfo($row['visits_id_type'])[0]['idtypes_name']]; ?>" />
+          <input type="hidden" name="form_data_v_signature" id="form_data_v_signature" value="<?php echo $row['visits_signature']; ?>" />
+          <input type="hidden" name="form_data_badge" id="form_data_badge" value="<?php echo $row['visits_badge']; ?>" />
+          <input type="hidden" name="form_data_signinby" id="form_data_signinby" value="<?php echo $Users->readUserFirstAndLast($row['visits_initials'])[0]["users_firstname"] . " " . $Users->readUserFirstAndLast($row['visits_initials'])[0]["users_lastname"]; ?>" />
+          <input type="hidden" name="form_data_vwfby" id="form_data_vwfby" value="<?php echo $Users->readUserFirstAndLast($db_vendorinfo_approverid)[0]["users_firstname"] . " " . $Users->readUserFirstAndLast($db_vendorinfo_approverid)[0]["users_lastname"]; ?>" />
+          <input type="hidden" name="form_data_checklistrequired" id="form_data_checklistrequired" value="<?php if($db_vendorinfo_checklistrequired===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_checklistrequired===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_routinework" id="form_data_routinework" value="<?php if($db_vendorinfo_routinework===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_routinework===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_country" id="form_data_country" value="<?php echo $VisitInfo->getCountryInfo($row['visits_citizen'])[0]["countries_name"]; ?>" />
+          <input type="hidden" name="form_data_nonroutinework" id="form_data_nonroutinework" value="<?php if($db_vendorinfo_nonroutinework===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_nonroutinework===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_coi" id="form_data_coi" value="<?php if($db_vendorinfo_coi===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_coi===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_worksummary" id="form_data_worksummary" value="<?php echo $db_vendorinfo_worksummary; ?>" />
+          <input type="hidden" name="form_data_checklistcompleted" id="form_data_checklistcompleted" value="<?php if($db_vendorinfo_checklistcompleted===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_checklistcompleted===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_workcompleted" id="form_data_workcompleted" value="<?php if($db_vendorinfo_workcompleted===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_workcompleted===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_sitecleanup" id="form_data_sitecleanup" value="<?php if($db_vendorinfo_sitecleanup===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_sitecleanup===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_doccompleted" id="form_data_doccompleted" value="<?php if($db_vendorinfo_doccompleted===0){echo $transLang['STR_COMMON_NO'];}elseif($db_vendorinfo_doccompleted===1){echo $transLang['STR_COMMON_YES'];} ?>" />
+          <input type="hidden" name="form_data_equipmentsummary" id="form_data_equipmentsummary" value="<?php echo $db_vendorinfo_equipmentsummary; ?>" />
+
+          <button type="submit" name="print" id="print" class="btn btn-primary btn-block btn-sm"><i class="fa fa-print"></i>&nbsp;<?php echo $transLang['PRINT']; ?></button>
+
+        
+        </form>
+
+        <?php } ?>
+          
+                          
+                          
+
+        </td>
+        </tr>
+<?php } ?>
+                    <?php endforeach ?>
                 </tbody>
             </table>
         </div>
diff --git a/signin.php b/signin.php
index bfe51d2..ccd1caa 100644
--- a/signin.php
+++ b/signin.php
@@ -108,43 +108,43 @@ if(empty($form_data['form_data_stage'])){
       <div class="form-group form-row">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" value="" id="q1" required>
-          <label class="form-check-label" for="q1"><b><?php echo $transLang['COVID-Q1-TITLE']; ?></b><br><?php echo $transLang['COVID-Q1-TEXT']; ?></label>
-          <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+          <label class="form-check-label" for="q1"><b><?php echo $transLang['COVID-Q1-TITLE']; ?></b><br><?php echo $transLang['COVID-Q1-DESC']; ?></label>
+          <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
         </div>
       </div>
       <div class="form-group form-row">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" value="" id="q2" required>
-          <label class="form-check-label" for="q2"><b><?php echo $transLang['COVID-Q2-TITLE']; ?></b><br><?php echo $transLang['COVID-Q2-TEXT']; ?></label>
-          <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+          <label class="form-check-label" for="q2"><b><?php echo $transLang['COVID-Q2-TITLE']; ?></b><br><?php echo $transLang['COVID-Q2-DESC']; ?></label>
+          <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
         </div>
       </div>
       <div class="form-group form-row">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" value="" id="q3" required>
-          <label class="form-check-label" for="q3"><b><?php echo $transLang['COVID-Q3-TITLE']; ?></b><br><?php echo $transLang['COVID-Q3-TEXT']; ?></label>
-          <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+          <label class="form-check-label" for="q3"><b><?php echo $transLang['COVID-Q3-TITLE']; ?></b><br><?php echo $transLang['COVID-Q3-DESC']; ?></label>
+          <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
         </div>
       </div>
       <div class="form-group form-row">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" value="" id="q4" required>
-          <label class="form-check-label" for="q4"><b><?php echo $transLang['COVID-Q4-TITLE']; ?></b><br><?php echo $transLang['COVID-Q4-TEXT']; ?></label>
-          <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+          <label class="form-check-label" for="q4"><b><?php echo $transLang['COVID-Q4-TITLE']; ?></b><br><?php echo $transLang['COVID-Q4-DESC']; ?></label>
+          <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
         </div>
       </div>
       <div class="form-group form-row">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" value="" id="q5" required>
-          <label class="form-check-label" for="q5"><b><?php echo $transLang['COVID-Q5-TITLE']; ?></b><br><?php echo $transLang['COVID-Q5-TEXT']; ?></label>
-          <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+          <label class="form-check-label" for="q5"><b><?php echo $transLang['COVID-Q5-TITLE']; ?></b><br><?php echo $transLang['COVID-Q5-DESC']; ?></label>
+          <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
         </div>
       </div>
       <div class="form-group form-row">
         <div class="form-check">
           <input class="form-check-input" type="checkbox" value="" id="q6" required>
-          <label class="form-check-label" for="q6"><b><?php echo $transLang['COVID-Q6-TITLE']; ?></b><br><?php echo $transLang['COVID-Q6-TEXT']; ?></label>
-          <div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
+          <label class="form-check-label" for="q6"><b><?php echo $transLang['COVID-Q6-TITLE']; ?></b><br><?php echo $transLang['COVID-Q6-DESC']; ?></label>
+          <div class="invalid-feedback"><?php echo $transLang['STR_COMMON_REQUIRED']; ?></div>
         </div>
       </div>
       <div class="row">&nbsp;</div>
@@ -192,7 +192,7 @@ if(empty($form_data['form_data_stage'])){
       <?php echo Csrf::getInputToken('home') ?>
       <div class="row row-cols-1 mb-4">
         <div class="col d-grid gap-2">
-          <?php echo $transLang['CUSTOMERVENDOR_DESC']; ?>
+          <?php echo $transLang['STR_VENDORINFO_CUSTOMERORVENDOR_DESC']; ?>
         </div>
       </div>
       <div class="row row-cols-1 mb-4">
@@ -201,7 +201,7 @@ if(empty($form_data['form_data_stage'])){
             <input type="radio" class="btn-check btn-lg" name="form_data_isvendor" id="customer-outlined" autocomplete="off" value="0" required>
             <label class="btn btn-outline-primary btn-lg" for="customer-outlined"><?php echo $transLang['CUSTOMER']; ?></label>
             <input type="radio" class="btn-check btn-lg" name="form_data_isvendor" id="vendor-outlined" autocomplete="off" value="1" required>
-            <label class="btn btn-outline-primary btn-lg" for="vendor-outlined"><?php echo $transLang['VENDORINFO-VENDORTITLE']; ?></label>
+            <label class="btn btn-outline-primary btn-lg" for="vendor-outlined"><?php echo $transLang['STR_VENDORINFO_VENDOR_TITLE']; ?></label>
           </div>
         </div>
       </div>
@@ -264,13 +264,13 @@ if(empty($form_data['form_data_stage'])){
       <div class="row row-cols-2 mb-4">
         <div class="col d-grid gap-2">
           <div class="input-group mb-3">
-            <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT1']; ?></span>
+            <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT1_TITLE']; ?></span>
             <input type="text" id="form_data_contact1" name="form_data_contact1" class="form-control" required autofocus>
           </div>
         </div>
         <div class="col d-grid gap-2">
           <div class="input-group mb-3">
-            <span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT2']; ?></span>
+            <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CONTACT2_TITLE']; ?></span>
             <input type="text" id="form_data_contact2" name="form_data_contact2" class="form-control" required autofocus>
           </div>
         </div>
@@ -278,7 +278,7 @@ if(empty($form_data['form_data_stage'])){
       <div class="row row-cols-2 mb-4">
         <div class="col d-grid gap-2">
           <div class="input-group mb-3">
-            <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"><?php echo $transLang['VENDORINFO-WORKSTART']; ?>&nbsp;<i class="fas fa-clock"></i></span>
+            <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"><?php echo $transLang['STR_VENDORINFO_WORKSTART_TITLE']; ?>&nbsp;<i class="fas fa-clock"></i></span>
             <input placeholder="" name="form_data_workstart" type="text" class="form-control form-control-sm bg-white datetimepicker-input datetimepicker-form_data_workstart" id="datetimepicker-form_data_workstart" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"/>
             <script type="text/javascript">
               $(function () {
@@ -289,7 +289,7 @@ if(empty($form_data['form_data_stage'])){
         </div>
         <div class="col d-grid gap-2">
           <div class="input-group mb-3">
-            <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"><?php echo $transLang['VENDORINFO-WORKEND']; ?>&nbsp;<i class="fas fa-clock"></i></span>
+            <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"><?php echo $transLang['STR_VENDORINFO_WORKEND_TITLE']; ?>&nbsp;<i class="fas fa-clock"></i></span>
             <input placeholder="" name="form_data_workend" type="text" class="form-control form-control-sm bg-white datetimepicker-input datetimepicker-form_data_workend" id="datetimepicker-form_data_workend" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"/>
             <script type="text/javascript">
               $(function () {
@@ -302,7 +302,7 @@ if(empty($form_data['form_data_stage'])){
       <div class="row row-cols-1 mb-4">
         <div class="col d-grid gap-2">
           <div class="input-group mb-3">
-            <span class="input-group-text"><?php echo $transLang['VENDORINFO-CUSTOMERIMPACTED']; ?></span>
+            <span class="input-group-text"><?php echo $transLang['STR_VENDORINFO_CUSTOMERIMPACTED_TITLE']; ?></span>
             <input type="text" id="form_data_customerimpacted" name="form_data_customerimpacted" class="form-control" required autofocus>
           </div>
         </div>
@@ -377,7 +377,7 @@ if(empty($form_data['form_data_stage'])){
       <?php echo Csrf::getInputToken('home') ?>
       <div class="row row-cols-1 mb-4">
         <div class="col d-grid gap-2">
-          <h4><?php echo $transLang['VSIGNATURE']; ?>:</h4>
+          <h4><?php echo $transLang['STR_COMMON_VSIGNATURE']; ?>:</h4>
           <div id="vsignature-parent sigs">
             <div id="vsignature"></div>
           </div>
@@ -393,9 +393,9 @@ if(empty($form_data['form_data_stage'])){
         <div class="col d-grid gap-2">
           <div class="btn-group">
             <input type="radio" class="btn-check btn-lg" name="form_data_escortrequired" id="no-outlined" autocomplete="off" value="0" required>
-            <label class="btn btn-outline-primary btn-lg" for="no-outlined"><?php echo $transLang['COMMON-NO']; ?></label>
+            <label class="btn btn-outline-primary btn-lg" for="no-outlined"><?php echo $transLang['STR_COMMON_NO']; ?></label>
             <input type="radio" class="btn-check btn-lg" name="form_data_escortrequired" id="yes-outlined" autocomplete="off" value="1" required>
-            <label class="btn btn-outline-primary btn-lg" for="yes-outlined"><?php echo $transLang['COMMON-YES']; ?></label>
+            <label class="btn btn-outline-primary btn-lg" for="yes-outlined"><?php echo $transLang['STR_COMMON_YES']; ?></label>
           </div>
         </div>
       </div>
@@ -412,7 +412,7 @@ if(empty($form_data['form_data_stage'])){
         });
         $("form").submit(function() {
           if($('#form_data_v_signature').val() === '') {
-            alert("<?php echo $transLang['SIGNATURE']; ?> <?php echo $transLang['REQUIRED']; ?>");
+            alert("<?php echo $transLang['STR_COMMON_SIGNATURE']; ?> <?php echo $transLang['STR_COMMON_REQUIRED']; ?>");
             return false;
           }
           return true;
@@ -463,7 +463,7 @@ if(empty($form_data['form_data_stage'])){
       </div>
       <div class="row row-cols-1 mb-4">
         <div class="col d-grid gap-2">
-          <h4><?php echo $transLang['ESIGNATURE']; ?>:</h4>
+          <h4><?php echo $transLang['STR_COMMON_ESIGNATURE']; ?>:</h4>
           <div id="esignature-parent sigs">
             <div id="esignature"></div>
           </div>
@@ -481,7 +481,7 @@ if(empty($form_data['form_data_stage'])){
         });
         $("form").submit(function() {
           if($('#form_data_e_signature').val() === '') {
-            alert("<?php echo $transLang['SIGNATURE']; ?> <?php echo $transLang['REQUIRED']; ?>");
+            alert("<?php echo $transLang['STR_COMMON_SIGNATURE']; ?> <?php echo $transLang['STR_COMMON_REQUIRED']; ?>");
             return false;
           }
           return true;
@@ -561,7 +561,7 @@ if(empty($form_data['form_data_stage'])){
           <input type="hidden" name="form_data_escortrequired" id="form_data_escortrequired" value="<?php echo $form_data['form_data_escortrequired']; ?>" />
           <input type="hidden" name="form_data_e_signature" id="form_data_e_signature" value="<?php echo $form_data['form_data_e_signature']; ?>" />
           <input type="hidden" name="form_data_escortname" id="form_data_escortname" value="<?php echo $form_data['form_data_escortname']; ?>" />
-          <a class="btn btn-lg btn-danger" href="index.php"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></a>
+          <a class="btn btn-lg btn-danger" href="index.php"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['STR_COMMON_CANCEL']; ?></a>
         </div>
         <div class="col d-grid gap-2">
           <button type="submit" id="saveBtn" class="btn btn-lg btn-success" name="saveBtn"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SIGNIN']; ?></button>
diff --git a/signin_display.php b/signin_display.php
index 177c7e4..7273753 100644
--- a/signin_display.php
+++ b/signin_display.php
@@ -140,7 +140,7 @@ if(!empty($form_data['form_data_stage'])){
     </div>
     <div class="row row-cols-1">
       <div class="col d-grid gap-2">
-        <a href="index.php" class="btn btn-success btn-lg btn-block" tabindex="-1" role="button" aria-disabled="true">&nbsp<br /><?php echo $transLang['HOME']; ?><br />&nbsp</a>
+        <a href="index.php" class="btn btn-success btn-lg btn-block" tabindex="-1" role="button" aria-disabled="true">&nbsp<br /><?php echo $transLang['STR_COMMON_HOME']; ?><br />&nbsp</a>
       </div>
     </div>
  <!-- END CONTENT -->
diff --git a/signout.php b/signout.php
index f227230..1e091eb 100644
--- a/signout.php
+++ b/signout.php
@@ -100,12 +100,12 @@
         <h2><i class="fas fa-sign-out-alt"></i> <?php echo $transLang['SIGNOUT']; ?></h2>
       </div>
       <div class="col d-grid gap-2">
-        <a href="index.php" class="btn btn-info" tabindex="-1" role="button" aria-disabled="true"><?php echo $transLang['BACK']; ?></a>
+        <a href="index.php" class="btn btn-info" tabindex="-1" role="button" aria-disabled="true"><?php echo $transLang['STR_COMMON_BACK']; ?></a>
       </div>
     </div>
     <form class="form-signout" method="post" onsubmit="return confirm('<?php echo $transLang['END_VISIT_WARNING']; ?>')">
       <?php echo Csrf::getInputToken('home') ?>
-      <ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1"><?php echo $transLang['PAGE']; ?></a></li>
+      <ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1"><?php echo $transLang['STR_COMMON_PAGE']; ?></a></li>
 <?php for ($i = 1; $i <= $page_count; $i++): ?>
         <li class="page-item<?php if ($i === $page_num): echo ' active'; else: echo ' '; endif; ?>"><a class="page-link" href="<?php echo $_SERVER['PHP_SELF'] . '?pnum=' . $i; ?>"><?php echo $i; ?></a></li>
 <?php endfor; ?>
@@ -131,7 +131,7 @@
                   if($finalvendorformcomplete===1){ ?>
               <button type="submit" name="endvisit" value="<?php echo $row['visits_id']; ?>" class="btn btn-warning btn-lg"><i class="fas fa-sign-out-alt"></i><?php echo $transLang['SIGNOUT']; ?></button>
                   <?php } elseif ($finalvendorformcomplete===0) { ?>
-              <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['VENDORINFO-UNABLETOSIGNOUT-HELP']; ?>">
+              <span class="d-inline-block" tabindex="0" data-bs-toggle="popover" data-bs-trigger="hover focus" data-bs-content="<?php echo $transLang['STR_VENDORINFO_UNABLETOSIGNOUT_DESC']; ?>">
               <button class="btn btn-warning btn-lg" disabled><i class="fas fa-sign-out-alt"></i><?php echo $transLang['SIGNOUT']; ?></button>
               </span>
               <?php } } } ?>
diff --git a/src/Database/VisitInfo.php b/src/Database/VisitInfo.php
index a4130dc..6ebf236 100644
--- a/src/Database/VisitInfo.php
+++ b/src/Database/VisitInfo.php
@@ -119,6 +119,7 @@ class VisitInfo {
         " . Registry::DB_PRFX . "vendorinfo.checklistcompleted as db_vendorinfo_checklistcompleted,
         " . Registry::DB_PRFX . "vendorinfo.workcompleted as db_vendorinfo_workcompleted,
         " . Registry::DB_PRFX . "vendorinfo.sitecleanup as db_vendorinfo_sitecleanup,
+        " . Registry::DB_PRFX . "vendorinfo.approverid as db_vendorinfo_approverid,
         " . Registry::DB_PRFX . "vendorinfo.doccompleted as db_vendorinfo_doccompleted
         FROM " . Registry::DB_PRFX . "vendorinfo
         WHERE " . Registry::DB_PRFX . "vendorinfo.visitid LIKE \"$visitid\"";
diff --git a/src/Language/de.lang.ini.example b/src/Language/de.lang.ini.example
index 7555303..c0cbc98 100644
--- a/src/Language/de.lang.ini.example
+++ b/src/Language/de.lang.ini.example
@@ -12,20 +12,20 @@ ADD_USER = 'Benutzer hinzufügen'
 ADD_USER_DESC = 'Alle Felder sind erforderlich! Benutzername und E-Mail müssen eindeutig sein. Minimale Passwortlänge ist '
 ADD_SITE = 'Ort hinzufügen'
 ADMINISTRATION = 'Verwaltung'
-ALL = 'Alles'
-APPROVE = 'Genehmigen'
+STR_COMMON_ALL = 'Alles'
+STR_COMMON_APPROVE = 'Genehmigen'
 APP_NAME = 'Einloggen / Ausloggen'
-BACK = 'Zurückkehren'
+STR_COMMON_BACK = 'Zurückkehren'
 BADGE = 'Abzeichen-Nummer'
 BADGEINITIALS = 'Abzeichen-Nummer & Initialen'
-CANCEL = 'Stornieren'
+STR_COMMON_CANCEL = 'Stornieren'
 CARNUM = 'Autokennzeichen'
-CHANGE = 'Wechseln'
-CHOOSE = 'Wählen'
+STR_COMMON_CHANGE = 'Wechseln'
+STR_COMMON_CHOOSE = 'Wählen'
 CITIZEN = 'Bürger?'
-CLOSE = 'Schließen'
+STR_COMMON_CLOSE = 'Schließen'
 COMPANY = 'Firma'
-CONFIRM = 'Bestätigen'
+STR_COMMON_CONFIRM = 'Bestätigen'
 COUNTRY = 'Land'
 CREATED = 'Erstellt'
 CUSTSIGNIN = 'Kundenanmeldung'
@@ -44,7 +44,7 @@ END = 'Ende'
 END_VISIT_WARNING = 'Sind Sie sicher, dass Sie sich abmelden möchten?'
 ESCORT = 'Eskorte'
 ESECTION = 'Klicken Sie hier, wenn eine Eskorte erforderlich ist'
-ESIGNATURE = 'Eskorte Unterschrift'
+STR_COMMON_ESIGNATURE = 'Eskorte Unterschrift'
 ETAG = 'Wer wird diese Person begleiten?'
 EXCEL = 'Excel'
 EXPORT = 'Export'
@@ -53,7 +53,7 @@ FIRSTNAME = 'Vorname'
 FLAG = 'Kennzeichen'
 GOTOSIGNIN = 'Gehen Sie zur Kunden-Anmeldeschnittstelle'
 GDPR_TEXT = 'GDPR ((Datenschutz-Grundverordnung) – Wir haben ein legitimes Interesse daran, Ihre persönlichen Daten aufzuzeichnen, so dass wir während Ihres Besuchs unsere Sorgfaltspflicht gegenüber Ihnen ausüben können und auch im Falle einer zukünftigen Haftung für Verluste oder Schäden, die auf unserer Website entstehen . Ihre Daten werden für maximal sechs Jahre sicher aufbewahrt.'
-HOME = 'Zuhause'
+STR_COMMON_HOME = 'Zuhause'
 HOURS = 'Std'
 IDTYPE_NOTEMPTY = 'Bitte wählen Sie den ID-Typ'
 ID_CHECKED = 'ID überprüft?'
@@ -86,7 +86,7 @@ NOT_AUTHORIZED = 'Nicht berechtigt!'
 OPTIONAL = 'Optional'
 OR_GO_HERE = 'Oder verwenden Sie die folgenden Optionen, um die Kioskeinstellungen zu ändern.'
 OUT = 'Aus'
-PAGE = 'Seite'
+STR_COMMON_PAGE = 'Seite'
 PASSPORT = 'Reisepass'
 PASSWORD = 'Passwort'
 PASSWORD_NOTCONFIRMED = 'Das Passwort muss bestätigt werden'
@@ -100,35 +100,35 @@ REASON = 'Grund für den Zugang zu Einrichtungen'
 REASONCOMPANY = 'Firma / Grund'
 REFERENCE = 'Referenz'
 REFRESH = 'Aktualisieren'
-REGION ='Region'
+STR_COMMON_REGION ='Region'
 REMEQPT = 'Ausrüstung entfernen'
 REPORTS = 'Berichte'
 REPORTS_DESC = 'Die Dropdown-Liste kann verwendet werden, um vorkonfigurierte Berichte auszuwählen. Weitere Berichte werden gerade geschrieben.'
-REQUIRED = 'Erforderlich'
-SANCTIONED = 'Sanktioniert - Kein Eintritt'
-SAVE = 'Speichern'
+STR_COMMON_REQUIRED = 'Erforderlich'
+STR_COMMON_SANCTIONED = 'Sanktioniert - Kein Eintritt'
+STR_COMMON_SAVE = 'Speichern'
 SELECTID = 'ID auswählen'
 SELECTREASON = 'Grund wählen'
 SERVER_TIME = 'Serverzeit'
-SIGNATURE = 'Unterschrift'
+STR_COMMON_SIGNATURE = 'Unterschrift'
 SIGNIN = 'Anmelden'
 SIGNINBY = 'Geprüft von'
 SIGNIN_THANKYOU = 'Danke, dass Sie sich angemeldet haben. Wir werden Ihnen in Kürze ein Badge zuweisen.'
 SIGNOUT = 'Abmelden'
 SIGNOUT_THANKYOU = 'Danke - Sie wurden erfolgreich abgemeldet.'
-SINCE = 'seit'
-SITE = 'Site'
+STR_COMMON_SINCE = 'seit'
+STR_COMMON_SITE = 'Site'
 SOFTWARE_VERSION = 'Version'
 SSANUM = 'SSA-Ticketnummer'
-START = 'Anfang'
+STR_COMMON_START = 'Anfang'
 STATEID = 'Staat ID'
 TERMSTITLE = 'Unsere Regeln'
 TESTING = 'Testen'
 TICKET = 'Fahrkarte #'
 TIMEINOUT = 'Zeit ein / aus'
 TIMEREASON = 'Zeit und Grund'
-TIMEZONE = 'Zeitzone'
-TOUR = 'Tour'
+STR_COMMON_TIMEZONE = 'Zeitzone'
+STR_COMMON_TOUR = 'Tour'
 UNAVAIL = 'Nicht verfügbar'
 USER-TYPES-USER = 'Nutzer'
 USER-USERNAME = 'Nutzername'
@@ -146,7 +146,7 @@ VALIDATIONS = 'Validierungen'
 VISITOR = 'Besucher'
 VOID = 'Leere'
 VOID_WARNING = 'Sind Sie sicher, dass Sie diesen Besuch aufheben möchten? Es gibt kein Rückgängig.'
-VSIGNATURE = 'Unterschrift des Besuchers'
+STR_COMMON_VSIGNATURE = 'Unterschrift des Besuchers'
 WELCOMETO = 'Willkommen zu'
 YESYES = 'Ja'
 NONO = 'Nein'
diff --git a/src/Language/en.lang.ini.example b/src/Language/en.lang.ini.example
index 8cd876e..be88730 100644
--- a/src/Language/en.lang.ini.example
+++ b/src/Language/en.lang.ini.example
@@ -1,15 +1,15 @@
 COVID-Q1-TITLE = 'I have NOT experienced any of the following symptoms in the past 48 hours.'
-COVID-Q1-TEXT = 'Fever, chills, cough, shortness of breath, fatigue, muscle or body aches, headache, new loss of taste or smell, sore throat, congestion or runny nose, nausea or vomiting, diarrhea.'
+COVID-Q1-DESC = 'Fever, chills, cough, shortness of breath, fatigue, muscle or body aches, headache, new loss of taste or smell, sore throat, congestion or runny nose, nausea or vomiting, diarrhea.'
 COVID-Q2-TITLE = 'I am NOT isolating or quarantining due to a positive test for COVID-19 nor do I believe that I may be sick with COVID-19.'
-COVID-Q2-TEXT = ''
+COVID-Q2-DESC = ''
 COVID-Q3-TITLE = 'I have NOT been in close physical contact in the last 14 days with:'
-COVID-Q3-TEXT = 'Anyone who is known to have laboratory-confirmed COVID-19? OR Anyone who has any symptoms consistent with COVID-19?'
+COVID-Q3-DESC = 'Anyone who is known to have laboratory-confirmed COVID-19? OR Anyone who has any symptoms consistent with COVID-19?'
 COVID-Q4-TITLE = 'I am NOT currently waiting on the results of a COVID-19 test.'
-COVID-Q4-TEXT = 'IMPORTANT: ANSWER "NO" IF YOU ARE WAITING ON THE RESULTS OF A PRE-TRAVEL OR POST-TRAVEL COVID-19 TEST'
+COVID-Q4-DESC = 'IMPORTANT: ANSWER "NO" IF YOU ARE WAITING ON THE RESULTS OF A PRE-TRAVEL OR POST-TRAVEL COVID-19 TEST'
 COVID-Q5-TITLE = 'I have NOT traveled in the past 10 days.'
-COVID-Q5-TEXT = 'Travel is defined as any trip that is overnight AND on public transportation (plane, train, bus, Uber, Lyft, cab, etc.) OR any trip that is overnight AND with people who are not in your household.'
+COVID-Q5-DESC = 'Travel is defined as any trip that is overnight AND on public transportation (plane, train, bus, Uber, Lyft, cab, etc.) OR any trip that is overnight AND with people who are not in your household.'
 COVID-Q6-TITLE = 'I certify that my responses are true and correct.'
-COVID-Q6-TEXT = 'All visitors must answer the above questions and then certify their answers are true and correct.'
+COVID-Q6-DESC = 'All visitors must answer the above questions and then certify their answers are true and correct.'
 
 ACCESS_LEVEL = 'Access'
 ACCOUNT = 'Account'
@@ -26,58 +26,58 @@ ADD_USER = 'Add User'
 ADD_USER_DESC = 'All fields are required!  Username and email must be unique.  Minimum password length is '
 ADD_SITE = 'Add Site'
 ADMINISTRATION = 'Administration'
-ALL = 'All'
-APPROVE = 'Approve'
+STR_COMMON_ALL = 'All'
+STR_COMMON_APPROVE = 'Approve'
 APP_NAME = 'Sign-In/Sign-Out'
-BACK = 'Back'
+STR_COMMON_BACK = 'Back'
 BADGE = 'Badge#'
 BADGEINITIALS = 'Badge & Initials'
 BRKFIX = 'Break/Fix'
-CANCEL = 'Cancel'
+STR_COMMON_CANCEL = 'Cancel'
 CARNUM = 'Car Registration #'
-CHANGE = 'Change'
-CHOOSE = 'Choose'
+STR_COMMON_CHANGE = 'Change'
+STR_COMMON_CHOOSE = 'Choose'
 CITIZEN = 'Citizen?'
-CLOSE = 'Close'
-COMMON-YES = 'Yes'
-COMMON-NO = 'No'
+STR_COMMON_CLOSE = 'Close'
+STR_COMMON_YES = 'Yes'
+STR_COMMON_NO = 'No'
 COMPANY = 'Company'
-CONFIRM = 'Confirm'
+STR_COMMON_CONFIRM = 'Confirm'
 
-VENDORINFO-CONTACT1 = 'Cell number'
-VENDORINFO-CONTACT2 = 'Office number'
-VENDORINFO-COI = 'Certificate of Insurance on File'
-VENDORINFO-COI-HELP = 'Is there a current copy of the certificate or memorandum of insurance on file?'
-VENDORINFO-ROUTINEWORK = 'Routine Work'
-VENDORINFO-ROUTINEWORK-HELP = 'Is this scheduled maintenance or recurring normal maintenance?'
-VENDORINFO-NONROUTINEWORK = 'Non-routine Work'
-VENDORINFO-NONROUTINEWORK-HELP = 'Is this non-scheduled or emergency maintenance?'
-VENDORINFO-CHECKLISTCOMPLETED = 'Checklist Completed'
-VENDORINFO-CHECKLISTCOMPLETED-HELP = 'If a checklist was required, has it been completed and submitted?'
-VENDORINFO-CHECKLISTREQUIRED = 'Checklist Required'
-VENDORINFO-CHECKLISTREQUIRED-HELP = 'Does this work require that a checklist be completed and turned in?'
-VENDORINFO-WORKSUMMARY = 'Work Summary'
-VENDORINFO-WORKSUMMARY-HELP = 'Briefly summarize the work to be performed and include details of any orders relevant to the work.'
-VENDORINFO-EQUIPMENTSUMMARY = 'Equipment Summary'
-VENDORINFO-EQUIPMENTSUMMARY-HELP = 'List any special equipment or tools being utilized and any protective devices or coverings to be brought in.'
-VENDORINFO-WORKCOMPLETED = 'Work Completed'
-VENDORINFO-WORKCOMPLETED-HELP = 'Was the work completed as discussed or promised?'
-VENDORINFO-DOCCOMPLETED = 'Documentation Completed'
-VENDORINFO-DOCCOMPLETED-HELP = 'If vendor documentation was required for this work, has it been submitted?'
-VENDORINFO-SITECLEANUP = 'Site Cleanup Completed'
-VENDORINFO-SITECLEANUP-HELP = 'Inspect the work location and confirm all tools and materials have been removed and the site is clean.'
-VENDORINFO-FORM = 'Vendor Work Form'
-VENDORINFO-WORKSTART = 'Work Start Date'
-VENDORINFO-WORKEND = 'Work End Date'
-VENDORINFO-VENDORTITLE = 'Vendor'
-VENDORINFO-UNABLETOSIGNOUT-HELP = 'Vendor Work Form has not yet been completed by the company, please ask security to complete the form in order to sign out.'
-VENDORINFO-DOCUMENTATIONREQUIRED = 'NOTICE - All vendors are required to complete a MOP, use a pre-authorized checklist, or a company-approved standard form to document work to be completed.'
-VENDORINFO-CUSTOMERIMPACTED = 'Customer Impacted'
+STR_VENDORINFO_CONTACT1_TITLE = 'Cell number'
+STR_VENDORINFO_CONTACT2_TITLE = 'Office number'
+STR_VENDORINFO_COI_TITLE = 'Certificate of Insurance on File'
+STR_VENDORINFO_COI_DESC = 'Is there a current copy of the certificate or memorandum of insurance on file?'
+STR_VENDORINFO_ROUTINEWORK_TITLE = 'Routine Work'
+STR_VENDORINFO_ROUTINEWORK_DESC = 'Is this scheduled maintenance or recurring normal maintenance?'
+STR_VENDORINFO_NONROUTINEWORK_TITLE = 'Non-routine Work'
+STR_VENDORINFO_NONROUTINEWORK_DESC = 'Is this non-scheduled or emergency maintenance?'
+STR_VENDORINFO_CHECKLISTCOMPLETED_TITLE = 'Checklist Completed'
+STR_VENDORINFO_CHECKLISTCOMPLETED_DESC = 'If a checklist was required, has it been completed and submitted?'
+STR_VENDORINFO_CHECKLISTREQUIRED_TITLE = 'Checklist Required'
+STR_VENDORINFO_CHECKLISTREQUIRED_DESC = 'Does this work require that a checklist be completed and turned in?'
+STR_VENDORINFO_WORKSUMMARY_TITLE = 'Work Summary'
+STR_VENDORINFO_WORKSUMMARY_DESC = 'Briefly summarize the work to be performed and include details of any orders relevant to the work.'
+STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE = 'Equipment Summary'
+STR_VENDORINFO_EQUIPMENTSUMMARY_DESC = 'List any special equipment or tools being utilized and any protective devices or coverings to be brought in.'
+STR_VENDORINFO_WORKCOMPLETED_TITLE = 'Work Completed'
+STR_VENDORINFO_WORKCOMPLETED_DESC = 'Was the work completed as discussed or promised?'
+STR_VENDORINFO_DOCCOMPLETED_TITLE = 'Documentation Completed'
+STR_VENDORINFO_DOCCOMPLETED_DESC = 'If vendor documentation was required for this work, has it been submitted?'
+STR_VENDORINFO_SITECLEANUP_TITLE = 'Site Cleanup Completed'
+STR_VENDORINFO_SITECLEANUP_DESC = 'Inspect the work location and confirm all tools and materials have been removed and the site is clean.'
+STR_VENDORINFO_FORM_TITLE = 'Vendor Work Form'
+STR_VENDORINFO_WORKSTART_TITLE = 'Work Start Date'
+STR_VENDORINFO_WORKEND_TITLE = 'Work End Date'
+STR_VENDORINFO_VENDOR_TITLE = 'Vendor'
+STR_VENDORINFO_UNABLETOSIGNOUT_DESC = 'Vendor Work Form has not yet been completed by the company, please ask security to complete the form in order to sign out.'
+STR_VENDORINFO_DOCUMENTATIONREQUIRED_DESC = 'NOTICE - All vendors are required to complete a MOP, use a pre-authorized checklist, or a company-approved standard form to document work to be completed.'
+STR_VENDORINFO_CUSTOMERIMPACTED_TITLE = 'Customer Impacted'
 
-TAGS-FORMINCOMPLETE = 'Form Incomplete'
-TAGS-FORMCOMPLETE = 'Form Complete'
+STR_TAGS_FORMINCOMPLETE_TITLE = 'Form Incomplete'
+STR_TAGS_FORMCOMPLETE_TITLE = 'Form Complete'
 
-REPORT-EXECUTE = 'Run Report'
+STR_REPORT_EXECUTE_TITLE = 'Run Report'
 
 COUNTRY = 'Country'
 CREATED = 'Created'
@@ -85,7 +85,7 @@ CUSTSIGNIN = 'Visitor Sign In'
 CUSTSIGNOUT = 'Visitor Sign Out'
 CUST_BANNER = 'Visitor Sign-In/Sign-Out'
 CUSTOMER = 'Customer/Guest'
-CUSTOMERVENDOR_DESC = 'Choose Customer if you are visiting as a client or guest of a client.  Choose Vendor if you are here to perform work as a direct contractor with our company.'
+STR_VENDORINFO_CUSTOMERORVENDOR_DESC = 'Choose Customer if you are visiting as a client or guest of a client.  Choose Vendor if you are here to perform work as a direct contractor with our company.'
 DECLINE = 'Decline'
 DEFAULT = 'Default'
 DELETE = 'Delete'
@@ -99,7 +99,7 @@ END = 'End'
 END_VISIT_WARNING = 'Are you sure you want to sign out?'
 ESCORT = 'Escort'
 ESECTION = 'Click here if escort required'
-ESIGNATURE = 'Escort Signature'
+STR_COMMON_ESIGNATURE = 'Escort Signature'
 ETAG = 'Who will escort this person?'
 EXCEL = 'Excel'
 EXPORT = 'Export'
@@ -109,7 +109,7 @@ FIRSTNAME = 'First Name'
 FLAG = 'Flag'
 GOTOSIGNIN = 'Go to Customer Sign-In Interface'
 GDPR_TEXT = 'GDPR (General Data Protection Regulation) – We have a legitimate interest in recording your personal details so that we can exercise our duty of care towards you during your visit and also in the event of any future liability for loss or harm incurred whilst on our site. Your details will be securely retained for a maximum of six years.'
-HOME = 'Home'
+STR_COMMON_HOME = 'Home'
 HOURS = 'Hours'
 IDTYPE_NOTEMPTY = 'Please select ID Type'
 ID_CHECKED = 'ID Checked?'
@@ -142,7 +142,7 @@ NOT_AUTHORIZED = 'Not Authorized!'
 OPTIONAL = 'Optional'
 OR_GO_HERE = 'Or use the following items to change kiosk settings.'
 OUT = 'Out'
-PAGE = 'Page'
+STR_COMMON_PAGE = 'Page'
 PASSPORT = 'Passport'
 PASSWORD = 'Password'
 PASSWORD_NOTCONFIRMED = 'Password must be confirmed'
@@ -157,27 +157,27 @@ REASON = 'Reason for Facility Access'
 REASONCOMPANY = 'Company / Reason'
 REFERENCE = 'Reference'
 REFRESH = 'Refresh'
-REGION ='Region'
+STR_COMMON_REGION ='Region'
 REMEQPT = 'Remove Equipment'
 REPORTS = 'Reports'
 REPORTS_DESC = 'The drop-down below can be used to select pre-configured reports.  Other reports are currently being written.'
-REQUIRED = 'Required'
-SANCTIONED = 'Sanctioned - No Entry'
-SAVE = 'Save'
+STR_COMMON_REQUIRED = 'Required'
+STR_COMMON_SANCTIONED = 'Sanctioned - No Entry'
+STR_COMMON_SAVE = 'Save'
 SELECTID = 'Select ID'
 SELECTREASON = 'Select Reason'
 SERVER_TIME = 'Server Time'
-SIGNATURE = 'Signature'
+STR_COMMON_SIGNATURE = 'Signature'
 SIGNIN = 'Sign In'
 SIGNINBY = 'Sign-In By'
 SIGNIN_THANKYOU = 'Thank you for signing in.  We will assign a badge shortly.'
 SIGNOUT = 'Sign Out'
 SIGNOUT_THANKYOU = 'Thank you - you have been successfully signed out.'
-SINCE = 'since'
-SITE = 'Site'
+STR_COMMON_SINCE = 'since'
+STR_COMMON_SITE = 'Site'
 SOFTWARE_VERSION = 'Version'
 SSANUM = 'SSA Ticket #'
-START = 'Start'
+STR_COMMON_START = 'Start'
 STATEID = 'State ID'
 TELCO = 'Telco/Circuit Install'
 TERMSTITLE = 'Our Rules'
@@ -185,8 +185,8 @@ TESTING = 'Testing'
 TICKET = 'Ticket #'
 TIMEINOUT = 'Time In / Time Out'
 TIMEREASON = 'Time & Reason'
-TIMEZONE = 'Timezone'
-TOUR = 'Tour'
+STR_COMMON_TIMEZONE = 'Timezone'
+STR_COMMON_TOUR = 'Tour'
 UNAVAIL = 'Unavailable'
 USER-TYPES-USER = 'User'
 USER-USERNAME = 'Username'
@@ -204,7 +204,7 @@ VALIDATIONS = 'Validations'
 VISITOR = 'Visitor'
 VOID = 'Void'
 VOID_WARNING = 'Are you sure you want to VOID this visit? There is no undo.'
-VSIGNATURE = 'Visitor Signature'
+STR_COMMON_VSIGNATURE = 'Visitor Signature'
 WELCOMETO = 'Welcome to'
 YESYES = 'Yes'
 NONO = 'No'
diff --git a/src/Language/es.lang.ini.example b/src/Language/es.lang.ini.example
index d27b2f7..cfc5eca 100644
--- a/src/Language/es.lang.ini.example
+++ b/src/Language/es.lang.ini.example
@@ -12,20 +12,20 @@ ADD_USER = 'Agregar usuario'
 ADD_USER_DESC = '¡Todos los campos son obligatorios! El nombre de usuario y el correo electrónico deben ser únicos. La longitud mínima de la contraseña es '
 ADD_SITE = 'Agregar sitio'
 ADMINISTRATION = 'Administración'
-ALL = 'Todos'
-APPROVE = 'Autorizar'
+STR_COMMON_ALL = 'Todos'
+STR_COMMON_APPROVE = 'Autorizar'
 APP_NAME = 'Lobby de inicio / cierre de sesión'
-BACK = 'Inicia'
+STR_COMMON_BACK = 'Inicia'
 BADGE = 'Numero de placa'
 BADGEINITIALS = 'Numero de placa & Sigla'
-CANCEL = 'Cancelar'
+STR_COMMON_CANCEL = 'Cancelar'
 CARNUM = 'Numero de registro del carro'
-CHANGE = 'Cambiar'
-CHOOSE = 'Por favor seleccione'
+STR_COMMON_CHANGE = 'Cambiar'
+STR_COMMON_CHOOSE = 'Por favor seleccione'
 CITIZEN = 'Ciudadano de estados unidos?'
-CLOSE = 'Cerrar'
+STR_COMMON_CLOSE = 'Cerrar'
 COMPANY = 'Organización'
-CONFIRM = 'Confirmar'
+STR_COMMON_CONFIRM = 'Confirmar'
 COUNTRY = 'País'
 CREATED = 'Creado'
 CUSTSIGNIN = 'Llegada del cliente'
@@ -44,7 +44,7 @@ END = 'Fin'
 END_VISIT_WARNING = '¿Estás seguro de que quieres cerrar sesión?'
 ESCORT = 'Guía'
 ESECTION = 'Haga clic aquí si usa una guía'
-ESIGNATURE = 'Firma de Escolta'
+STR_COMMON_ESIGNATURE = 'Firma de Escolta'
 ETAG = 'Quien escoltara a esta persona'
 EXCEL = 'Excel'
 EXPORT = 'Exportar'
@@ -53,7 +53,7 @@ FIRSTNAME = 'Nombre de pila'
 FLAG = 'Marcar'
 GOTOSIGNIN = 'Ir a la interfaz del cliente'
 GDPR_TEXT = 'GDPR (Reglamento general de protección de datos): tenemos un interés legítimo en registrar sus datos personales para que podamos ejercer nuestro deber de atención hacia usted durante su visita y también en el caso de cualquier responsabilidad futura por pérdida o daño incurrido mientras esté en nuestro sitio. . Sus datos se conservarán de forma segura durante un máximo de seis años.'
-HOME = 'Página de inicio'
+STR_COMMON_HOME = 'Página de inicio'
 HOURS = 'Horas'
 IDTYPE_NOTEMPTY = 'Por favor seleccione tipo'
 ID_CHECKED = 'Identificación verificada?'
@@ -86,7 +86,7 @@ NOT_AUTHORIZED = '¡No autorizado!'
 OPTIONAL = 'Opcional'
 OR_GO_HERE = 'O use los siguientes elementos para cambiar la configuración del quiosco.'
 OUT = 'Hora de salida'
-PAGE = 'Número de página'
+STR_COMMON_PAGE = 'Número de página'
 PASSPORT = 'Pasaporte'
 PASSWORD = 'Contraseña'
 PASSWORD_NOTCONFIRMED = 'La contraseña debe ser confirmada'
@@ -100,35 +100,35 @@ REASON = 'Razón para el acceso a las instalaciones'
 REASONCOMPANY = 'Empresa / Razón'
 REFERENCE = 'Referencia'
 REFRESH = 'Recargar'
-REGION ='Región'
+STR_COMMON_REGION ='Región'
 REMEQPT = 'Llevar Equipo'
 REPORTS = 'Informes'
 REPORTS_DESC = 'El menú desplegable a continuación se puede utilizar para seleccionar informes preconfigurados. Otros informes se están escribiendo actualmente.'
-REQUIRED = 'Necesario'
-SANCTIONED = 'Sancionado - Prohibida la entrada'
-SAVE = 'Salvar'
+STR_COMMON_REQUIRED = 'Necesario'
+STR_COMMON_SANCTIONED = 'Sancionado - Prohibida la entrada'
+STR_COMMON_SAVE = 'Salvar'
 SELECTID = 'Por favor seleccione'
 SELECTREASON = 'Por favor seleccione tipo'
 SERVER_TIME = 'Tiempo de Servidor'
-SIGNATURE = 'Firma'
+STR_COMMON_SIGNATURE = 'Firma'
 SIGNIN = 'Llegada del cliente'
 SIGNINBY = 'Verificada por'
 SIGNIN_THANKYOU = 'Gracias por iniciar sesión. Le asignaremos una credencial en breve.'
 SIGNOUT = 'Salida del cliente'
 SIGNOUT_THANKYOU = 'Gracias, te has desconectado.'
-SINCE = 'desde'
-SITE = 'Sitio'
+STR_COMMON_SINCE = 'desde'
+STR_COMMON_SITE = 'Sitio'
 SOFTWARE_VERSION = 'Versión del software'
 SSANUM = 'Número de boleto de la SSA'
-START = 'Comienzo'
+STR_COMMON_START = 'Comienzo'
 STATEID = 'Identificación del estado'
 TERMSTITLE = 'Nuestras reglas'
 TESTING = 'Ensayo'
 TICKET = 'Billete #'
 TIMEINOUT = 'Tiempo de inicio / fin de tiempo'
 TIMEREASON = 'Tiempo y razon'
-TIMEZONE = 'Zona horaria'
-TOUR = 'Visitar'
+STR_COMMON_TIMEZONE = 'Zona horaria'
+STR_COMMON_TOUR = 'Visitar'
 UNAVAIL = 'Indisponible'
 USER-TYPES-USER = 'Usuario'
 USER-USERNAME = 'Usuario'
@@ -146,7 +146,7 @@ VALIDATIONS = 'Validaciones'
 VISITOR = 'Visitante'
 VOID = 'Invalidar'
 VOID_WARNING = '¿Seguro que quieres anular esta visita? No hay deshacer.'
-VSIGNATURE = 'Firma del Visitante'
+STR_COMMON_VSIGNATURE = 'Firma del Visitante'
 WELCOMETO = 'Bienvenido a'
 YESYES = 'Sí'
 NONO = 'No'
diff --git a/src/Language/fr.lang.ini.example b/src/Language/fr.lang.ini.example
index 57bbcbe..2b8b97c 100644
--- a/src/Language/fr.lang.ini.example
+++ b/src/Language/fr.lang.ini.example
@@ -12,20 +12,20 @@ ADD_USER = 'Ajouter un utilisateur'
 ADD_USER_DESC = 'Tous les champs sont requis! Le nom d&#39;utilisateur et l&#39;adresse e-mail doivent être uniques. La longueur minimale du mot de passe est '
 ADD_SITE = 'Ajouter un site'
 ADMINISTRATION = 'Administration'
-ALL = 'Tout'
-APPROVE = 'Approuver'
+STR_COMMON_ALL = 'Tout'
+STR_COMMON_APPROVE = 'Approuver'
 APP_NAME = 'Vestibule register/se désinscrire'
-BACK = 'Retour'
+STR_COMMON_BACK = 'Retour'
 BADGE = 'Numéro de badge'
 BADGEINITIALS = 'Numéro de badge & Initiales'
-CANCEL = 'Annuler'
+STR_COMMON_CANCEL = 'Annuler'
 CARNUM = 'Numéro d&#39;immatriculation'
-CHANGE = 'Changement'
-CHOOSE = 'Choisir'
+STR_COMMON_CHANGE = 'Changement'
+STR_COMMON_CHOOSE = 'Choisir'
 CITIZEN = 'Citoyen?'
-CLOSE = 'Terminer'
+STR_COMMON_CLOSE = 'Terminer'
 COMPANY = 'Organisation'
-CONFIRM = 'Confirmer'
+STR_COMMON_CONFIRM = 'Confirmer'
 COUNTRY = 'Pays'
 CREATED = 'Créé'
 CUSTSIGNIN = 'Connexion client'
@@ -44,7 +44,7 @@ END = 'Fin'
 END_VISIT_WARNING = 'Êtes-vous certain de vouloir vous déconnecter?'
 ESCORT = 'Escorte'
 ESECTION = 'Cliquez ici si une escorte est requise'
-ESIGNATURE = 'Escorte Signature'
+STR_COMMON_ESIGNATURE = 'Escorte Signature'
 ETAG = 'Qui escortera cette personne?'
 EXCEL = 'Excel'
 EXPORT = 'Exportation'
@@ -53,7 +53,7 @@ FIRSTNAME = 'Prénom'
 FLAG = 'Marque'
 GOTOSIGNIN = 'Aller à l&#39;interface de connexion client'
 GDPR_TEXT = 'GDPR (règlement général sur la protection des données) - Nous avons un intérêt légitime à enregistrer vos données personnelles de manière à pouvoir exercer notre devoir de vigilance à votre égard pendant votre visite et également en cas de responsabilité future pour la perte ou le préjudice subi pendant la visite de notre site. . Vos coordonnées seront conservées de manière sécurisée pendant un maximum de six ans.'
-HOME = 'Accueil'
+STR_COMMON_HOME = 'Accueil'
 HOURS = 'Heures'
 IDTYPE_NOTEMPTY = 'Veuillez sélectionner un type d&#39;identification'
 ID_CHECKED = 'ID vérifié?'
@@ -86,7 +86,7 @@ NOT_AUTHORIZED = 'Pas autorisé!'
 OPTIONAL = 'Optionnel'
 OR_GO_HERE = 'Ou utilisez les éléments suivants pour modifier les paramètres du kiosque.'
 OUT = 'En dehors'
-PAGE = 'Page'
+STR_COMMON_PAGE = 'Page'
 PASSPORT = 'Passeport'
 PASSWORD = 'Mot de passe'
 PASSWORD_NOTCONFIRMED = 'Le mot de passe doit être confirmé'
@@ -100,35 +100,35 @@ REASON = 'Raison de l’accès aux installations'
 REASONCOMPANY = 'Organisation / Raison'
 REFERENCE = 'Reference'
 REFRESH = 'Actualiser'
-REGION ='Région'
+STR_COMMON_REGION ='Région'
 REMEQPT = 'Remove Equipment'
 REPORTS = 'Rapports'
 REPORTS_DESC = 'Le menu déroulant ci-dessous peut être utilisé pour sélectionner des rapports préconfigurés. D&#39;autres rapports sont en cours de rédaction.'
-REQUIRED = 'Required'
-SANCTIONED = 'Sanctionné - Aucune entrée'
-SAVE = 'Save'
+STR_COMMON_REQUIRED = 'Required'
+STR_COMMON_SANCTIONED = 'Sanctionné - Aucune entrée'
+STR_COMMON_SAVE = 'Save'
 SELECTID = 'Select ID'
 SELECTREASON = 'Select Reason'
 SERVER_TIME = 'Heure du serveur'
-SIGNATURE = 'Signature'
+STR_COMMON_SIGNATURE = 'Signature'
 SIGNIN = 'Sign In'
 SIGNINBY = 'Vérifié par'
 SIGNIN_THANKYOU = 'Merci pour votre connexion. Nous attribuerons un badge dans quelques instants.'
 SIGNOUT = 'Sign Out'
 SIGNOUT_THANKYOU = 'Merci - vous avez été déconnecté avec succès.'
-SINCE = 'depuis'
-SITE = 'Site'
+STR_COMMON_SINCE = 'depuis'
+STR_COMMON_SITE = 'Site'
 SOFTWARE_VERSION = 'Version'
 SSANUM = 'Numéro de billet SSA'
-START = 'Début'
+STR_COMMON_START = 'Début'
 STATEID = 'State ID'
 TERMSTITLE = 'Nos règles'
 TESTING = 'Essai'
 TICKET = 'Billet #'
 TIMEINOUT = 'Time In / Time Out'
 TIMEREASON = 'Temps et raison'
-TIMEZONE = 'Fuseau horaire'
-TOUR = 'Tour'
+STR_COMMON_TIMEZONE = 'Fuseau horaire'
+STR_COMMON_TOUR = 'Tour'
 UNAVAIL = 'Indisponible'
 USER-TYPES-USER = 'Utilisateur'
 USER-USERNAME = 'Nom d&#39;utilisateur'
@@ -146,7 +146,7 @@ VALIDATIONS = 'Endossements'
 VISITOR = 'Visiteur'
 VOID = 'Vide'
 VOID_WARNING = 'Êtes-vous sûr de vouloir annuler cette visite? Il n&#39;y a pas d&#39;annuler.'
-VSIGNATURE = 'Visiteur Signature'
+STR_COMMON_VSIGNATURE = 'Visiteur Signature'
 WELCOMETO = 'Bienvenue à'
 YESYES = 'Oui'
 NONO = 'Non'
diff --git a/users.php b/users.php
index c15f906..fbaef71 100644
--- a/users.php
+++ b/users.php
@@ -143,7 +143,7 @@
                                         <div class="form-row">
                                             <div class="col input-group">
                                                 <div class="input-group-text">
-                                                    <span class="input-group-text" id="username"><?php echo $transLang['SITE']; ?></span>
+                                                    <span class="input-group-text" id="username"><?php echo $transLang['STR_COMMON_SITE']; ?></span>
                                                 </div>
                                                 <select id="sitepermissions" name="sitepermissions[]" class="form-select" multiple size="5">
                                                     <?php foreach($SiteInfo->listSite("0", "0") as $row): ?>
@@ -155,7 +155,7 @@
                                         <div class="form-row">
                                             <div class="col input-group">
                                                 <input type="hidden" id="edituserid" name="edituserid" value="<?php echo $edituser["0"]["users_id"]; ?>" />
-                                                <button type="submit" class="form-control btn btn-block btn-success" value="Submit" name="editusercomplete"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
+                                                <button type="submit" class="form-control btn btn-block btn-success" value="Submit" name="editusercomplete"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['STR_COMMON_SAVE']; ?></button>
                                             </div>
                                         </div>
                                 </fieldset>
@@ -296,7 +296,7 @@ if (0 === $row_count): else: $page_count = (int)ceil($row_count / $StaticFunctio
                     <button type="button" class="btn btn-block btn-lg btn-success" data-bs-toggle="modal" data-bs-target="#addUserModal"><?php echo $transLang['ADD_USER']; ?></button>
                 </div>
             </div>
-            <?php echo '<ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">' . $transLang['PAGE'] . '</a></li>'; for ($i = 1; $i <= $page_count; $i++): echo '<li class="page-item'; if ($i === $page_num): echo ' active'; else: echo ' '; endif; echo '"><a class="page-link" href="' . $_SERVER['PHP_SELF'] . '?pnum=' . $i . '">' . $i . '</a></li>'; endfor; echo '</ul>'; ?>
+            <?php echo '<ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">' . $transLang['STR_COMMON_PAGE'] . '</a></li>'; for ($i = 1; $i <= $page_count; $i++): echo '<li class="page-item'; if ($i === $page_num): echo ' active'; else: echo ' '; endif; echo '"><a class="page-link" href="' . $_SERVER['PHP_SELF'] . '?pnum=' . $i . '">' . $i . '</a></li>'; endfor; echo '</ul>'; ?>
             <table class="table">
                 <thead class="thead-dark">
                     <tr>
@@ -392,7 +392,7 @@ if (0 === $row_count): else: $page_count = (int)ceil($row_count / $StaticFunctio
                                         <div class="row">
                                             <div class="col-sm">
                                                 <select class="form-select" id="usertype" aria-label="<?php echo $transLang['ACCESS_LEVEL']; ?>" name="usertype" required>
-                                                    <option value="" selected><?php echo $transLang['CHOOSE']; ?> <?php echo $transLang['ACCESS_LEVEL']; ?></option><?php foreach($Users->readUserTypeByUserTypeID("%") as $row): ?>
+                                                    <option value="" selected><?php echo $transLang['STR_COMMON_CHOOSE']; ?> <?php echo $transLang['ACCESS_LEVEL']; ?></option><?php foreach($Users->readUserTypeByUserTypeID("%") as $row): ?>
                                                     <option value="<?php echo $row['usertypes_id']; ?>"><?php echo $transLang[$row['usertypes_name']]; ?></option><?php endforeach; ?>
                                                 </select>
                                             </div>
@@ -444,17 +444,17 @@ if (0 === $row_count1): else: $page_count1 = (int)ceil($row_count1 / $StaticFunc
         <div class="container">
             <div class="row">
                 <div class="col-sm">
-                    <h2><?php echo $app_current_pageicon . $transLang['SITE']; ?></h2>
+                    <h2><?php echo $app_current_pageicon . $transLang['STR_COMMON_SITE']; ?></h2>
                 </div>
                 <div class="col-sm">
                     <button type="button" class="btn btn-success btn-lg" data-bs-toggle="modal" data-bs-target="#addSiteModal"><?php echo $transLang['ADD_SITE']; ?></button>
                 </div>
             </div>
-            <?php echo '<ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">' . $transLang['PAGE'] . '</a></li>'; for ($i1 = 1; $i1 <= $page_count1; $i1++): echo '<li class="page-item'; if ($i1 === $page_num1): echo ' active'; else: echo ' '; endif; echo '"><a class="page-link" href="' . $_SERVER['PHP_SELF'] . '?pnum1=' . $i1 . '">' . $i1 . '</a></li>'; endfor; echo '</ul>'; ?>
+            <?php echo '<ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">' . $transLang['STR_COMMON_PAGE'] . '</a></li>'; for ($i1 = 1; $i1 <= $page_count1; $i1++): echo '<li class="page-item'; if ($i1 === $page_num1): echo ' active'; else: echo ' '; endif; echo '"><a class="page-link" href="' . $_SERVER['PHP_SELF'] . '?pnum1=' . $i1 . '">' . $i1 . '</a></li>'; endfor; echo '</ul>'; ?>
             <table class="table">
                 <thead class="thead-dark">
                     <tr>
-                        <th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['TIMEZONE']; ?></th><th><?php echo $transLang['REGION']; ?></th><th><?php echo $transLang['ACTIONS']; ?></th>
+                        <th><?php echo $transLang['NAME']; ?></th><th><?php echo $transLang['STR_COMMON_TIMEZONE']; ?></th><th><?php echo $transLang['STR_COMMON_REGION']; ?></th><th><?php echo $transLang['ACTIONS']; ?></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -495,9 +495,9 @@ if (0 === $row_count1): else: $page_count1 = (int)ceil($row_count1 / $StaticFunc
             <div class="row row-cols-1">
               <div class="col d-grid gap-2">
                 <div class="input-group input-group-sm mb-0">
-                  <span class="input-group-text"><?php echo $transLang['TIMEZONE']; ?></span>
+                  <span class="input-group-text"><?php echo $transLang['STR_COMMON_TIMEZONE']; ?></span>
                   <select class="form-control" id="timezone" name="timezone" required>
-                    <option value=""><?php echo $transLang['TIMEZONE']; ?></option>
+                    <option value=""><?php echo $transLang['STR_COMMON_TIMEZONE']; ?></option>
 <?php foreach(DateTimeZone::listIdentifiers(DateTimeZone::ALL) as $row2) { ?>
                     <option><?php echo $row2; ?></option>
 <?php }; ?>
@@ -510,7 +510,7 @@ if (0 === $row_count1): else: $page_count1 = (int)ceil($row_count1 / $StaticFunc
                 <div class="input-group input-group-sm mb-0">
                   <span class="input-group-text"><?php echo $transLang['NAME']; ?></span>
                   <select class="form-control" id="region" name="region" required>
-                    <option value=""><?php echo $transLang['REGION']; ?></option>
+                    <option value=""><?php echo $transLang['STR_COMMON_REGION']; ?></option>
                     <option>CAN</option>
                     <option>EMEA</option>
                     <option>US</option>
@@ -520,7 +520,7 @@ if (0 === $row_count1): else: $page_count1 = (int)ceil($row_count1 / $StaticFunc
             </div>
             <div class="row row-cols-1">
               <div class="col d-grid gap-2">
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['STR_COMMON_CANCEL']; ?></button>
                 <button type="submit" class="btn btn-success btn-sm" value="Submit" name="newsite"><i class="fas fa-user-plus"></i>&nbsp;<?php echo $transLang['ADD_SITE']; ?></button>
               </div>
             </div>