diff --git a/index.php b/index.php
index 027bcb2..a0712e0 100644
--- a/index.php
+++ b/index.php
@@ -145,66 +145,78 @@ if (Registry::AUTHMETHOD == 'SAML') {
 <?php die; } } } ?>
 
 
-<!-- USER CONTENT START -->
-<?php 
-  $post_outtime = filter_input(INPUT_POST, 'outtime');
-  if (!empty($_POST['endvisit'])) {
-    if (!empty($_POST['outtime'])) {
-      $newdate = new DateTime($_POST['outtime'], new DateTimeZone($timezone));
-      $newdate->setTimeZone(new DateTimeZone('UTC'));
-      $postdate=$newdate->format('Y-m-d H:i:s');
-      echo $VisitActions->endVisit($_POST['endvisit'], $postdate);
-    } else {
-      echo $VisitActions->endVisit($_POST['endvisit'], $StaticFunctions->getUTC());
-    }
-  }
-
-// VOID VISIT IF POSTED
-  if (!empty($_POST['voidvisit'])) {
-    echo $VisitActions->voidVisit($_POST['voidvisit'], "0", $_POST['voidnotes']);
-  }
-
-// FINALIZE VENDOR RECORD IF POSTED
-  if (!empty($_POST['updatefinalvendorvisit'])) {
-    echo $VisitActions->setInfoVendorVisitFinal($_POST['db_vendorinfo_id'], $_POST['db_vendorinfo_checklistcompleted'], $_POST['db_vendorinfo_workcompleted'], $_POST['db_vendorinfo_sitecleanup'], $uid, $_POST['db_vendorinfo_doccompleted'] );
-  }
-
-// MANUAL SIGNIN
+<!-- AUTHENTICATED -->
+<?php                                                                           // FILTER POSTED DATA
 $form_data = filter_input_array(INPUT_POST, [
-    'form_data_stage' => (string)FILTER_SANITIZE_STRING,
-    'form_data_siteid' => (int)FILTER_VALIDATE_INT,
-    'form_data_isvendor' => (int)FILTER_VALIDATE_INT,
-    'form_data_manualsignindate' => (string)FILTER_SANITIZE_STRING,
-    'form_data_firstname' => (string)FILTER_SANITIZE_STRING,
-    'form_data_lastname' => (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,
+    'fd_formAction' => (string)FILTER_SANITIZE_STRING,
+    'fd_siteId' => (int)FILTER_VALIDATE_INT,
+    'fd_isVendor' => (int)FILTER_VALIDATE_INT,
+    'fd_manualTimeDate' => (string)FILTER_SANITIZE_STRING,
+    'fd_firstName' => (string)FILTER_SANITIZE_STRING,
+    'fd_lastName' => (string)FILTER_SANITIZE_STRING,
+    'fd_carNum' => (string)FILTER_SANITIZE_STRING,
+    'fd_ssaNum' => (string)FILTER_SANITIZE_STRING,
+    'fd_visitorCompany' => (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,
+    'fd_visitType' => (int)FILTER_VALIDATE_INT,
+    'fd_escortRequired' => (int)FILTER_VALIDATE_INT,
+    'fd_visitorSignature' => (string)FILTER_SANITIZE_STRING,
+    'fd_escortSignature' => (string)FILTER_SANITIZE_STRING,
+    'fd_escortName' => (string)FILTER_SANITIZE_STRING,
     'db_vendorinfo_id' => (string)FILTER_SANITIZE_STRING,
     'db_vendorinfo_checklistrequired' => (string)FILTER_SANITIZE_STRING,
     'db_vendorinfo_routinework' => (string)FILTER_SANITIZE_STRING,
     'db_vendorinfo_nonroutinework' => (string)FILTER_SANITIZE_STRING,
     'db_vendorinfo_coi' => (string)FILTER_SANITIZE_STRING,
     'db_vendorinfo_worksummary' => (string)FILTER_SANITIZE_STRING,
-    'db_vendorinfo_equipmentsummary' => (string)FILTER_SANITIZE_STRING
-    
-    
-    
-    
+    'db_vendorinfo_equipmentsummary' => (string)FILTER_SANITIZE_STRING,
+    'fd_voidVisitId' => (int)FILTER_VALIDATE_INT,
+    'fd_voidVisitNotes' => (string)FILTER_SANITIZE_STRING,
+    'db_vendorinfo_checklistcompleted' => (int)FILTER_VALIDATE_INT,
+    'db_vendorinfo_workcompleted' => (int)FILTER_VALIDATE_INT,
+    'db_vendorinfo_sitecleanup' => (int)FILTER_VALIDATE_INT,
+    'db_vendorinfo_doccompleted' => (int)FILTER_VALIDATE_INT,
+    'outtime' => (string)FILTER_SANITIZE_STRING,
+    'endvisit' => (string)FILTER_SANITIZE_STRING
 ]);
+?>
+  
+<?php  if (!empty($form_data['endvisit'])) {                                    // MANUAL SIGN OUT
+    if (!empty($form_data['outtime'])) {
+      $newdate = new DateTime($form_data['outtime'], new DateTimeZone($timezone));
+      $newdate->setTimeZone(new DateTimeZone('UTC'));
+      $postdate=$newdate->format('Y-m-d H:i:s');
+      echo $VisitActions->endVisit($form_data['endvisit'], $postdate);
+    } else {
+      echo $VisitActions->endVisit($form_data['endvisit'], $StaticFunctions->getUTC());
+    }
+  } ?>
 
-// UPDATE VENDOR RECORD IF POSTED
-if(!empty($form_data['form_data_stage'])){
-  if($form_data['form_data_stage']==='updateinitialvendorvisit'){
+<?php if(!empty($form_data['fd_formAction'])){                                  // DECLINE VISIT
+  if($form_data['fd_formAction']==='actionVoidVisit'){
+    ob_start();
+    $VisitActions->voidVisit(
+            $form_data['fd_voidVisitId'],
+            "0",
+            $form_data['fd_voidVisitNotes'] );
+    ob_end_clean(); unset($form_data); } } ?>
+
+<?php if(!empty($form_data['fd_formAction'])){                                  // COMPLETE VENDOR FORM FINAL STAGE
+  if($form_data['fd_formAction']==='actionVendorComplete'){
+    ob_start();
+    $VisitActions->setInfoVendorVisitFinal(
+            $form_data['db_vendorinfo_id'],
+            $form_data['db_vendorinfo_checklistcompleted'],
+            $form_data['db_vendorinfo_workcompleted'],
+            $form_data['db_vendorinfo_sitecleanup'],
+            $form_data['db_vendorinfo_doccompleted'] );
+    ob_end_clean(); unset($form_data); } } ?>
+
+<?php if(!empty($form_data['fd_formAction'])){                                  // CONFIRM VENDOR FORM INITIAL STAGE
+  if($form_data['fd_formAction']==='actionVendorConfirmation'){
     ob_start();
     $VisitActions->setInfoVendorVisitInitial(
             $form_data['db_vendorinfo_id'],
@@ -214,37 +226,42 @@ if(!empty($form_data['form_data_stage'])){
             $form_data['db_vendorinfo_coi'],
             $form_data['db_vendorinfo_worksummary'],
             $form_data['db_vendorinfo_equipmentsummary'] );
-    ob_end_clean();
-    unset($form_data);
-  }
-}
+    ob_end_clean(); unset($form_data); } } ?>
 
-// SET MANUALSIGNIN STAGE
-if(!empty($form_data['form_data_stage'])){
-  if($form_data['form_data_stage']==='manualsignin'){
-if(!empty($form_data['form_data_manualsignindate'])){
-      $manualdate = new DateTime($form_data['form_data_manualsignindate'], new DateTimeZone($timezone));
+<?php if(!empty($form_data['fd_formAction'])){                                  // MANUAL SIGN IN
+  if($form_data['fd_formAction']==='actionManualSignIn'){
+    ob_start();
+    if(!empty($form_data['fd_manualTimeDate'])){                                // CONVERT LOCAL TO UTC IF SET
+      $manualdate = new DateTime($form_data['fd_manualTimeDate'], new DateTimeZone($timezone));
       $manualdate->setTimeZone(new DateTimeZone('UTC'));
-      $form_data['form_data_manualsignindate']=$manualdate->format('Y-m-d H:i:s');
+      $form_data['fd_manualTimeDate']=$manualdate->format('Y-m-d H:i:s');
     } else {
-      $form_data['form_data_manualsignindate'] = $StaticFunctions->getUTC();
-}
+      $form_data['fd_manualTimeDate'] = $StaticFunctions->getUTC();             // OTHERWISE USE NOW()UTC
+    }
+    $visitid = $VisitActions->newVisit(                                         // ADD VISIT RECORD
+            $form_data['fd_firstName'],
+            $form_data['fd_lastName'],
+            $form_data['fd_visitorCompany'], 
+            $form_data['fd_visitType'], 
+            $form_data['fd_manualTimeDate'], 
+            $form_data['fd_visitorSignature'], 
+            $form_data['fd_siteId'], "1", 
+            $form_data['fd_escortSignature'], 
+            $form_data['fd_escortName'], 
+            empty($form_data['fd_carNum'])?"":$form_data['fd_carNum'], 
+            empty($form_data['fd_ssaNum'])?"":$form_data['fd_ssaNum'], 
+            empty($form_data['fd_isVendor'])?(int)0:$form_data['fd_isVendor']);
+    if($form_data['fd_isVendor'] === (int)1) {                                  // ADD VENDOR RECORD IF REQUIRED
+      $vendorid = $VisitActions->setInfoVendorVisitNew(
+              $visitid, 
+              empty($form_data['form_data_contact1'])?"":$form_data['form_data_contact1'], 
+              empty($form_data['form_data_contact2'])?"":$form_data['form_data_contact2'], 
+              empty($form_data['form_data_workstart'])?"":$form_data['form_data_workstart'], 
+              empty($form_data['form_data_workend'])?"":$form_data['form_data_workend']);
+    }
+    ob_end_clean(); unset($form_data); } } ?>
 
-if (empty($form_data['form_data_carnum'])) { $carnum="";} else {$carnum=$form_data['form_data_carnum'];}
-if (empty($form_data['form_data_ssanum'])) { $ssanum="";} else {$ssanum=$form_data['form_data_ssanum'];}
-if (empty($form_data['form_data_isvendor'])) { $isvendor="0";} else {$isvendor=$form_data['form_data_isvendor'];}
-if (empty($form_data['form_data_contact1'])) { $db_vendorinfo_contact1="";} else {$db_vendorinfo_contact1=$form_data['form_data_contact1'];}
-if (empty($form_data['form_data_contact2'])) { $db_vendorinfo_contact2="";} else {$db_vendorinfo_contact2=$form_data['form_data_contact2'];}
-if (empty($form_data['form_data_workstart'])) { $db_vendorinfo_workstart="";} else {$db_vendorinfo_workstart=$form_data['form_data_workstart'];}
-if (empty($form_data['form_data_workend'])) { $db_vendorinfo_workend="";} else {$db_vendorinfo_workend=$form_data['form_data_workend'];}
-$visitid = $VisitActions->newVisit($form_data['form_data_firstname'], $form_data['form_data_lastname'], $form_data['form_data_company'], $form_data['form_data_visittype'], $form_data['form_data_manualsignindate'], $form_data['form_data_v_signature'], $form_data['form_data_siteid'], "1", $form_data['form_data_e_signature'], $form_data['form_data_escortname'], $carnum, $ssanum, $isvendor);
-if($form_data['form_data_isvendor'] === (int)"1") {
-  $vendorid = $VisitActions->setInfoVendorVisitNew($visitid, $db_vendorinfo_contact1, $db_vendorinfo_contact2, $db_vendorinfo_workstart, $db_vendorinfo_workend);
-}
-}
-}
-
-  // If post is approved, save after error checking.
+<?php                                                                           // APPROVE VISITOR
   if (!empty($_POST['approvevisit'])) {
     if (empty($_POST['id_type'])) { $id_type_error=1; } else {$id_type_error=0;};
     if (empty($_POST['badge'])) { $badge_error=1; } else {$badge_error=0;};    
@@ -279,7 +296,7 @@ if($form_data['form_data_isvendor'] === (int)"1") {
       e.preventDefault();
       var _self = $(this);
       var myVoidId = _self.data('id');
-      $("#voidvisit").val(myVoidId);
+      $("#fd_voidVisitId").val(myVoidId);
       $(_self.attr('href')).modal('show');
     });
   </script>
@@ -300,12 +317,13 @@ if($form_data['form_data_isvendor'] === (int)"1") {
         </div>
         <div class="modal-body">
           <form class="form form-approve" method="post">
+                  <input type="hidden" name="fd_formAction" id="fd_formAction" value="actionVoidVisit" />
             <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['NOTES']; ?></span>
-                  <input type="hidden" name="voidvisit" id="voidvisit" value="" />
-                  <textarea class="form-control" id="voidnotes" name="voidnotes" placeholder="<?php echo $transLang['NOTES_PLACEHOLDER']; ?>"></textarea>
+                  <input type="hidden" name="fd_voidVisitId" id="fd_voidVisitId" value="" />
+                  <textarea class="form-control" id="fd_voidVisitNotes" name="fd_voidVisitNotes" placeholder="<?php echo $transLang['NOTES_PLACEHOLDER']; ?>"></textarea>
                 </div>
               </div>
             </div>
@@ -352,15 +370,15 @@ if($form_data['form_data_isvendor'] === (int)"1") {
         </div>
         <div class="modal-body">
           <form method="post">
-            <input type="hidden" name="form_data_stage" id="form_data_stage" value="manualsignin" />
+            <input type="hidden" name="fd_formAction" id="fd_formAction" value="actionManualSignIn" />
             <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" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_manualsignindate">Sign In Date/Time&nbsp;<i class="fas fa-clock"></i></span>
-                  <input placeholder="" name="form_data_manualsignindate" type="text" class="form-control bg-white datetimepicker-input datetimepicker-form_data_manualsignindate" id="datetimepicker-form_data_manualsignindate" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_manualsignindate"/>
+                  <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-fd_manualTimeDate">Sign In Date/Time&nbsp;<i class="fas fa-clock"></i></span>
+                  <input placeholder="" name="fd_manualTimeDate" type="text" class="form-control bg-white datetimepicker-input datetimepicker-fd_manualTimeDate" id="datetimepicker-fd_manualTimeDate" data-toggle="datetimepicker" data-target=".datetimepicker-fd_manualTimeDate"/>
                   <script type="text/javascript">
                     $(function () {
-                      $('.datetimepicker-form_data_manualsignindate').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
+                      $('.datetimepicker-fd_manualTimeDate').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
                     });
                   </script>
                 </div>
@@ -370,30 +388,30 @@ if($form_data['form_data_isvendor'] === (int)"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['FIRSTNAME']; ?></span>
-                  <input class="form-control" id="form_data_firstname" name="form_data_firstname" />
+                  <input class="form-control" id="fd_firstName" name="fd_firstName" />
                 </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['LASTNAME']; ?></span>
-                  <input class="form-control" id="form_data_lastname" name="form_data_lastname" />
+                  <input class="form-control" id="fd_lastName" name="fd_lastName" />
                 </div>
               </div>
             </div>
-            <input type="hidden" name="form_data_siteid" id="form_data_siteid" value="<?php echo $siteid; ?>" />
-            <input type="hidden" name="form_data_v_signature" id="form_data_v_signature" value="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAQAAACzWFxqAAAAXklEQVR42u3RMQEAAAzCsOHf9CxwcqQSmpymigVABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASI2h4b9QAzse8LYwAAAABJRU5ErkJggg==" />
+            <input type="hidden" name="fd_siteId" id="fd_siteId" value="<?php echo $siteid; ?>" />
+            <input type="hidden" name="fd_visitorSignature" id="fd_visitorSignature" value="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAQAAACzWFxqAAAAXklEQVR42u3RMQEAAAzCsOHf9CxwcqQSmpymigVABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASI2h4b9QAzse8LYwAAAABJRU5ErkJggg==" />
       <?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
       <div class="row row-cols-2 mb-2">
         <div class="col d-grid gap-2">
           <div class="input-group mb-3">
             <span class="input-group-text"><?php echo $transLang['CARNUM']; ?></span>
-            <input type="text" id="form_data_carnum" name="form_data_carnum" class="form-control" placeholder="<?php echo $transLang['CARNUM']; ?>" required autofocus>
+            <input type="text" id="fd_carNum" name="fd_carNum" class="form-control" placeholder="<?php echo $transLang['CARNUM']; ?>" 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['SSANUM']; ?></span>
-            <input type="text" id="form_data_ssanum" name="form_data_ssanum" class="form-control" placeholder="<?php echo $transLang['SSANUM']; ?>" required autofocus>
+            <input type="text" id="fd_ssaNum" name="fd_ssaNum" class="form-control" placeholder="<?php echo $transLang['SSANUM']; ?>" required autofocus>
           </div>
         </div>
       </div>
@@ -402,7 +420,7 @@ if($form_data['form_data_isvendor'] === (int)"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['COMPANY']; ?></span>
-                  <input class="form-control" id="form_data_company" name="form_data_company" />
+                  <input class="form-control" id="fd_visitorCompany" name="fd_visitorCompany" />
                 </div>
               </div>
             </div>
@@ -461,8 +479,8 @@ if($form_data['form_data_isvendor'] === (int)"1") {
                   $('#vendorrequiredsection').show();
                   $('#escortrequiredsection').hide();
                   $('#escortrequiredswitchsection').hide();
-                  $('#form_data_escortname').removeAttr('required');
-                  $('#form_data_escortname').removeAttr('data-error');
+                  $('#fd_escortName').removeAttr('required');
+                  $('#fd_escortName').removeAttr('data-error');
                   $('#form_data_contact1').attr('required', '');
                   $('#form_data_contact1').attr('data-error', 'This field is required.');
                   $('#form_data_contact2').attr('required', '');
@@ -474,8 +492,8 @@ if($form_data['form_data_isvendor'] === (int)"1") {
                 } else {
                   $('#vendorrequiredsection').hide();
                   $('#escortrequiredswitchsection').show();
-                  $('#form_data_escortname').removeAttr('required');
-                  $('#form_data_escortname').removeAttr('data-error');
+                  $('#fd_escortName').removeAttr('required');
+                  $('#fd_escortName').removeAttr('data-error');
                   $('#form_data_contact1').removeAttr('required');
                   $('#form_data_contact1').removeAttr('data-error');
                   $('#form_data_contact2').removeAttr('required');
@@ -492,7 +510,7 @@ if($form_data['form_data_isvendor'] === (int)"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['REASON']; ?></span>
-                  <select class="form-select" id="form_data_visittype" name="form_data_visittype" required>
+                  <select class="form-select" id="fd_visitType" name="fd_visitType" required>
                     <option value="" selected><?php echo $transLang['SELECTREASON']; ?></option><?php foreach($VisitTypeInfo->getInfoVisitType("%","%") as $vtrow): ?>
                     <option value="<?php echo $vtrow['visittypes_id']; ?>">[<?php if($vtrow['visittypes_isvendor']===0){echo "Visitor";}elseif($vtrow['visittypes_isvendor']===1){echo "Vendor";} ?>] <?php echo $transLang[$vtrow['visittypes_name']]; ?></option><?php endforeach; ?>
                   </select>
@@ -511,7 +529,7 @@ if($form_data['form_data_isvendor'] === (int)"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['ENAME']; ?></span>
-                  <input type="text" id="form_data_escortname" name="form_data_escortname" class="form-control" placeholder="<?php echo $transLang['ETAG']; ?>" autofocus>
+                  <input type="text" id="fd_escortName" name="fd_escortName" class="form-control" placeholder="<?php echo $transLang['ETAG']; ?>" autofocus>
                 </div>
               </div>
             </div>
@@ -520,12 +538,12 @@ if($form_data['form_data_isvendor'] === (int)"1") {
                 var checkedEscortValue=$("#escortrequiredswitch").is(":checked");
                 if (checkedEscortValue === true) {
                   $('#escortrequiredsection').show();
-                  $('#form_data_escortname').attr('required', '');
-                  $('#form_data_escortname').attr('data-error', 'This field is required.');
+                  $('#fd_escortName').attr('required', '');
+                  $('#fd_escortName').attr('data-error', 'This field is required.');
                 } else {
                   $('#escortrequiredsection').hide();
-                  $('#form_data_escortname').removeAttr('required');
-                  $('#form_data_escortname').removeAttr('data-error');
+                  $('#fd_escortName').removeAttr('required');
+                  $('#fd_escortName').removeAttr('data-error');
                 }
               });
               $('#escortrequiredswitch').trigger("change");
@@ -607,7 +625,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">
-                  <input type="hidden" name="form_data_stage" id="form_data_stage" value="updateinitialvendorvisit" />
+                  <input type="hidden" name="fd_formAction" id="fd_formAction" value="actionVendorConfirmation" />
                   <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['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 />
@@ -750,7 +768,7 @@ 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">
-                  <input type="hidden" name="updatefinalvendorvisit" id="updatefinalvendorvisit" value="updatefinalvendorvisit" />
+                  <input type="hidden" name="fd_formAction" id="fd_formAction" value="actionVendorComplete" />
                   <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['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 />
@@ -1054,7 +1072,7 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
                     <button type="submit" name="approvevisit" id="approvevisit-<?php echo $visitid; ?>" value="<?php echo $visitid; ?>" class="btn btn-success btn-block btn-sm <?php if(empty($initialvendorformcomplete)) {$initialvendorformcomplete=0;}; 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>
+                    <a data-bs-toggle="modal" data-bs-target="#voidModal" data-id="<?php echo $visitid; ?>" href="#voidModal" name="fd_voidVisitId" 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>
                   </div>
                   <div class="input-group input-group-sm mb-0">
                     <span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-<?php echo $visitid; ?>"><i class="fas fa-clock"></i></span>
diff --git a/profile.php b/profile.php
index da95fc0..dd57d88 100644
--- a/profile.php
+++ b/profile.php
@@ -92,12 +92,18 @@ $form_data = filter_input_array(INPUT_POST, [
   'fd_lastName' => (string)FILTER_SANITIZE_STRING,
   'fd_userEmail' => (string)FILTER_SANITIZE_STRING
 ]);
+?>
 
+<?php                                                                           // PAGE CONSTANTS
+  $selfName = (string)'profile.php';                                            // PAGE URL
+?>
+
+<?php
   $minpasslength = $StaticFunctions->getMinPass();
   if (isset($form_data['fd_saveProfile'])):
     if (empty($form_data['fd_initialPassword']) && empty($form_data['fd_confirmPassword'])):
       $Users->setUserInfo($session_user["0"]["users_id"], $form_data['fd_firstName'], $form_data['fd_lastName'], $form_data['fd_userEmail'], $session_user["0"]["users_usertypeid"], $session_user["0"]["users_password"]);
-      header('Location: profile.php');
+      header("Location: $selfName");
     elseif (strlen($form_data['fd_initialPassword']) < $minpasslength):
       echo "Password must be at least $minpasslength characters.";
     elseif (!empty($form_data['fd_initialPassword']) && empty($form_data['fd_confirmPassword'])):
@@ -110,7 +116,7 @@ $form_data = filter_input_array(INPUT_POST, [
     $hasher = new PasswordHash(8, FALSE);
     $password = $hasher->HashPassword($form_data['fd_initialPassword']);
     $Users->setUserInfo($session_user["0"]["users_id"], $form_data['fd_firstName'], $form_data['fd_lastName'], $form_data['fd_userEmail'], $session_user["0"]["users_usertypeid"], $password);
-    header('Location: profile.php');
+    header("Location: $selfName");
     endif;
   endif;
 ?>
@@ -122,7 +128,7 @@ $form_data = filter_input_array(INPUT_POST, [
       <div class="col d-grid gap-2 text-center">
       </div>
       <div class="col text-end">
-        <a href="profile.php" type="button" class="btn btn-primary btn-lg"><i class="fa fa-redo"></i> <?=$transLang['REFRESH']?></a>
+        <a href="<?=$selfName?>" type="button" class="btn btn-primary btn-lg"><i class="fa fa-redo"></i> <?=$transLang['REFRESH']?></a>
       </div>
     </div>
     <?php if (Registry::AUTHMETHOD == 'INTERNAL') { ?>
@@ -144,13 +150,13 @@ $form_data = filter_input_array(INPUT_POST, [
           <div class="col d-grid gap-2">
             <div class="input-group">
               <span class="input-group-text"><?=$transLang['USER-USERNAME']?></span>
-              <input class="form-control bg-white" type="text" name="username" id="username" maxlength="50" value="<?php echo $session_user["0"]["users_username"]; ?>" readonly />
+              <input class="form-control bg-white" type="text" name="fd_userName" id="fd_userName" maxlength="50" value="<?php echo $session_user["0"]["users_username"]; ?>" readonly />
             </div>
           </div>
           <div class="col d-grid gap-2">
             <div class="input-group">
               <span class="input-group-text"><?=$transLang['CREATED']?></span>
-              <input class="form-control bg-white" type="text" name="created" id="created" value="<?php echo $session_user["0"]["users_created"]; ?>" readonly />
+              <input class="form-control bg-white" type="text" name="fd_userCreated" id="fd_userCreated" value="<?php echo $session_user["0"]["users_created"]; ?>" readonly />
             </div>
           </div>
         </div>
@@ -158,7 +164,7 @@ $form_data = filter_input_array(INPUT_POST, [
           <div class="col d-grid gap-2">
             <div class="input-group">
               <span class="input-group-text"><?=$transLang['USER-TYPE']?></span>
-              <input class="form-control bg-white" type="text" name="usertype" id="usertype" maxlength="50" value="<?php echo $transLang[$session_user["0"]["users_usertype"]]; ?>" readonly />
+              <input class="form-control bg-white" type="text" name="fd_userType" id="fd_userType" maxlength="50" value="<?php echo $transLang[$session_user["0"]["users_usertype"]]; ?>" readonly />
             </div>
           </div>
           <div class="col d-grid gap-2">
diff --git a/src/Language/de.lang.ini.example b/src/Language/de.lang.ini.example
index a666a5a..fa1a3f5 100644
--- a/src/Language/de.lang.ini.example
+++ b/src/Language/de.lang.ini.example
@@ -1,4 +1,3 @@
-LOGIN_SSO_DESCR = 'This system uses SSO authentication with your organization. Click the Login button to proceed to your organizational sign-on system and you will be returned to this application after the authentication process.'
 ACCESS_LEVEL = 'Zugriffsebene'
 ACCOUNT = 'Konto'
 ACCOUNT_INFO_AUTHLOCKED = 'Dieses System verwendet SSO-Authentifizierung. Die meisten Benutzerdaten dürfen hier nicht geändert werden.'
@@ -9,7 +8,6 @@ ACKNOWLEDGEMENT_DOC_NAME = 'Unsere Regeln'
 ACKNOWLEDGEMENT_VENDOR_DOC_NAME = 'Werksbestätigung des Anbieters'
 ACTIONS = 'Aktionen'
 ACTIVEVISITS = 'Aktive Besuche'
-ADDEQPT = 'Ausrüstung hinzufügen'
 ADD_SITE = 'Ort hinzufügen'
 ADD_USER = 'Benutzer hinzufügen'
 ADD_USER_DESC = 'Alle Felder sind erforderlich! Benutzername und E-Mail müssen eindeutig sein. Minimale Passwortlänge ist '
@@ -17,7 +15,6 @@ ADMINISTRATION = 'Verwaltung'
 APP_NAME = 'Einloggen / Ausloggen'
 BADGE = 'Abzeichen-Nummer'
 BADGEINITIALS = 'Abzeichen-Nummer & Initialen'
-BRKFIX = 'Unterbrechen/Reparieren'
 CARNUM = 'Autokennzeichen'
 CITIZEN = 'Bürger?'
 COMPANY = 'Firma'
@@ -56,7 +53,6 @@ ESECTION = 'Klicken Sie hier, wenn eine Eskorte erforderlich ist'
 ETAG = 'Wer wird diese Person begleiten?'
 EXCEL = 'Excel'
 EXPORT = 'Export'
-FACCLEAN = 'Gebäudereinigung'
 FIRST = 'Vorname'
 FIRSTNAME = 'Vorname'
 FLAG = 'Kennzeichen'
@@ -69,23 +65,18 @@ ID_TYPE = 'ID-Typ?'
 ILLEGAL_CHARACTERS = 'Benutzername enthält unzulässige Zeichen'
 IN = 'In'
 INITIALS = 'Initialen'
-INSTHARD = 'Installation von Hardware'
-INSTSOFT = 'Installation der Software'
 LANG = 'Sprache'
 LAST = 'Nachname'
 LASTNAME = 'Nachname'
 LOCAL_TIME = 'Ortszeit'
 LOGIN = 'Anmeldung'
+LOGIN_SSO_DESCR = 'This system uses SSO authentication with your organization. Click the Login button to proceed to your organizational sign-on system and you will be returned to this application after the authentication process.'
 LOGOUT = 'Ausloggen'
-MAINHARD = 'Wartung von Hardware'
-MAINSOFT = 'Wartung der Software'
-MEETING = 'Treffen'
 META_DESC = 'LobbySIO ist eine Touchscreen-kompatible Signatur-Pad / Anmeldeformular-Webapp.'
 MIN_PASSWORD_LENGTH = 'Minimale Passwortlänge ist '
 NAME = 'Vollständiger Name'
 NEW = 'Neu'
 NEXT = 'Nächster'
-NONEAVA = 'Keiner'
 NONO = 'Nein'
 NOSIGNIN = 'Keine Anmeldung'
 NOSITE = 'Kein Standort ausgewählt'
@@ -103,13 +94,11 @@ PASSWORD_NOTMATCH = 'Passwörter stimmen nicht überein'
 PDF = 'PDF'
 PENDINGAPPROVALS = 'Ausstehende Genehmigungen'
 PLEASE_LOG_IN = 'Anmelden für Genehmigungen und Reporting'
-PREVMAIN = 'Vorbeugende Wartung'
 PRINT = 'Drucken'
 REASON = 'Grund für den Zugang zu Einrichtungen'
 REASONCOMPANY = 'Firma / Grund'
 REFERENCE = 'Referenz'
 REFRESH = 'Aktualisieren'
-REMEQPT = 'Ausrüstung entfernen'
 REPORTS = 'Berichte'
 REPORTS_DESC = 'Die Dropdown-Liste kann verwendet werden, um vorkonfigurierte Berichte auszuwählen. Weitere Berichte werden gerade geschrieben.'
 SELECTID = 'ID auswählen'
@@ -120,8 +109,6 @@ 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.'
-STR_SIGNOUT_THANKYOU_TITLE = 'Danke!'
-STR_SIGNOUT_THANKYOU_DESC = 'Sie wurden erfolgreich abgemeldet. Danke für Ihren Besuch.'
 SOFTWARE_VERSION = 'Version'
 SSANUM = 'SSA-Ticketnummer'
 STATEID = 'Staat ID'
@@ -147,11 +134,12 @@ STR_COMMON_SITE = 'Site'
 STR_COMMON_START = 'Anfang'
 STR_COMMON_TIMEZONE = 'Zeitzone'
 STR_COMMON_TOUR = 'Tour'
-TOUR = 'Tour'
 STR_COMMON_VSIGNATURE = 'Unterschrift des Besuchers'
 STR_COMMON_YES = 'Ja'
 STR_REPORT_EXECUTE_TITLE = 'Bericht ausführen'
 STR_SIGNIN_MANUAL = 'Manuelle Anmeldung'
+STR_SIGNOUT_THANKYOU_DESC = 'Sie wurden erfolgreich abgemeldet. Danke für Ihren Besuch.'
+STR_SIGNOUT_THANKYOU_TITLE = 'Danke!'
 STR_TAGS_FORMCOMPLETE_TITLE = 'Vollständig'
 STR_TAGS_FORMINCOMPLETE_TITLE = 'Unvollständig'
 STR_VENDORINFO_CHECKLISTCOMPLETED_DESC = 'Falls eine Checkliste erforderlich war, wurde diese ausgefüllt und eingereicht?'
@@ -169,6 +157,7 @@ STR_VENDORINFO_DOCCOMPLETED_TITLE = 'Dokumentation abgeschlossen'
 STR_VENDORINFO_DOCUMENTATIONREQUIRED_DESC = 'HINWEIS - Alle Anbieter müssen eine Verfahrensmethode ausfüllen, eine vorab genehmigte Checkliste oder ein vom Unternehmen genehmigtes Standardformular verwenden, um die auszuführenden Arbeiten zu dokumentieren.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_DESC = 'Listen Sie alle verwendeten Spezialausrüstungen oder Werkzeuge und alle mitzubringenden Schutzvorrichtungen oder Abdeckungen auf.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE = 'Zusammenfassung der Ausrüstung'
+STR_VENDORINFO_FOOTERWARNING = 'Bei Problemen mit einem Teil des Anbieterformulars oder den Regeln wenden Sie sich sofort an den Sicherheitsdienst.'
 STR_VENDORINFO_FORM_TITLE = 'Formular für Lieferantenarbeit'
 STR_VENDORINFO_NONROUTINEWORK_DESC = 'Handelt es sich um eine außerplanmäßige oder eine Notfallwartung?'
 STR_VENDORINFO_NONROUTINEWORK_TITLE = 'Nicht-Routine-Arbeit'
@@ -177,20 +166,31 @@ STR_VENDORINFO_ROUTINEWORK_TITLE = 'Routinearbeit'
 STR_VENDORINFO_SITECLEANUP_DESC = 'Inspizieren Sie den Arbeitsplatz und vergewissern Sie sich, dass alle Werkzeuge und Materialien entfernt wurden und der Standort sauber ist.'
 STR_VENDORINFO_SITECLEANUP_TITLE = 'Website-Bereinigung abgeschlossen'
 STR_VENDORINFO_UNABLETOSIGNOUT_DESC = 'Das Lieferantenarbeitsformular wurde vom Unternehmen noch nicht ausgefüllt. Bitten Sie den Sicherheitsdienst, das Formular auszufüllen, um sich abzumelden.'
+STR_VENDORINFO_VALIDATIONFINAL = 'Elemente der Validierungsprüfung:'
+STR_VENDORINFO_VALIDATIONINITIAL = 'Elemente der Erstprüfung:'
 STR_VENDORINFO_VENDOR_TITLE = 'Verkäuferin'
+STR_VENDORINFO_VERIFIEDBY = 'Geprüft von'
 STR_VENDORINFO_WORKCOMPLETED_DESC = 'Wurde die Arbeit wie besprochen oder versprochen abgeschlossen?'
 STR_VENDORINFO_WORKCOMPLETED_TITLE = 'Arbeit abgeschlossen'
 STR_VENDORINFO_WORKEND_TITLE = 'Enddatum der Arbeit'
 STR_VENDORINFO_WORKSTART_TITLE = 'Arbeitsbeginndatum'
 STR_VENDORINFO_WORKSUMMARY_DESC = 'Fassen Sie die auszuführenden Arbeiten kurz zusammen und geben Sie alle für die Arbeiten relevanten Aufträge an.'
 STR_VENDORINFO_WORKSUMMARY_TITLE = 'Arbeitszusammenfassung'
-STR_VENDORINFO_FOOTERWARNING = 'Bei Problemen mit einem Teil des Anbieterformulars oder den Regeln wenden Sie sich sofort an den Sicherheitsdienst.'
-STR_VENDORINFO_VALIDATIONFINAL = 'Elemente der Validierungsprüfung:'
-STR_VENDORINFO_VALIDATIONINITIAL = 'Elemente der Erstprüfung:'
-STR_VENDORINFO_VERIFIEDBY = 'Geprüft von'
-TELCO = 'Telekommunikation/Circuit-Installation'
+STR_VISITTYPES_ADDEQPT = 'Ausrüstung hinzufügen'
+STR_VISITTYPES_BRKFIX = 'Unterbrechen/Reparieren'
+STR_VISITTYPES_FACCLEAN = 'Gebäudereinigung'
+STR_VISITTYPES_INSTHARD = 'Installation von Hardware'
+STR_VISITTYPES_INSTSOFT = 'Installation der Software'
+STR_VISITTYPES_MAINHARD = 'Wartung von Hardware'
+STR_VISITTYPES_MAINSOFT = 'Wartung der Software'
+STR_VISITTYPES_MEETING = 'Treffen'
+STR_VISITTYPES_NONE = 'Keiner'
+STR_VISITTYPES_PREVMAIN = 'Vorbeugende Wartung'
+STR_VISITTYPES_REMEQPT = 'Ausrüstung entfernen'
+STR_VISITTYPES_TELCO = 'Telekommunikation/Circuit-Installation'
+STR_VISITTYPES_TESTING = 'Testen'
+STR_VISITTYPES_TOUR = 'Tour'
 TERMSTITLE = 'Unsere Regeln'
-TESTING = 'Testen'
 TICKET = 'Fahrkarte #'
 TIMEINOUT = 'Zeit ein / aus'
 TIMEREASON = 'Zeit und Grund'
@@ -198,6 +198,7 @@ UNAVAIL = 'Nicht verfügbar'
 USER-INFORMATION = 'Nutzerinformation'
 USER-LIST-HELP = 'Bearbeiten oder löschen Sie Benutzer und Gruppen unten.'
 USER-LISTHEADER = 'Benutzerliste'
+USER-SITES = 'Standortverwaltung'
 USER-TYPE = 'Benutzertyp'
 USER-TYPES-ADMIN = 'Administrator'
 USER-TYPES-KIOSK = 'Kiosk'
@@ -207,7 +208,6 @@ USER-USERNAME = 'Nutzername'
 USER-USERNAMENOTEMPTY = 'Der Benutzername darf nicht leer sein'
 USER-USERNAMEUSED = 'Benutzername bereits vergeben'
 USER-USERS = 'Benutzerverwaltung'
-USER-SITES = 'Standortverwaltung'
 VALIDATIONS = 'Validierungen'
 VISITOR = 'Besucher'
 VOID = 'Leere'
diff --git a/src/Language/en.lang.ini.example b/src/Language/en.lang.ini.example
index 937c6dc..8b85788 100644
--- a/src/Language/en.lang.ini.example
+++ b/src/Language/en.lang.ini.example
@@ -1,4 +1,3 @@
-LOGIN_SSO_DESCR = 'This system uses SSO authentication with your organization. Click the Login button to proceed to your organizational sign-on system and you will be returned to this application after the authentication process.'
 ACCESS_LEVEL = 'Access'
 ACCOUNT = 'Account'
 ACCOUNT_INFO_AUTHLOCKED = 'This system is using SSO authentication.  Most user details may not be changed here.'
@@ -9,7 +8,6 @@ ACKNOWLEDGEMENT_DOC_NAME = 'Our Rules'
 ACKNOWLEDGEMENT_VENDOR_DOC_NAME = 'Vendor Worksite Acknowledgement'
 ACTIONS = 'Actions'
 ACTIVEVISITS = 'Active Visits'
-ADDEQPT = 'Add Equipment'
 ADD_SITE = 'Add Site'
 ADD_USER = 'Add User'
 ADD_USER_DESC = 'All fields are required!  Username and email must be unique.  Minimum password length is '
@@ -17,7 +15,6 @@ ADMINISTRATION = 'Administration'
 APP_NAME = 'Sign-In/Sign-Out'
 BADGE = 'Badge#'
 BADGEINITIALS = 'Badge & Initials'
-BRKFIX = 'Break/Fix'
 CARNUM = 'Car Registration #'
 CITIZEN = 'Citizen?'
 COMPANY = 'Company'
@@ -56,7 +53,6 @@ ESECTION = 'Click here if escort required'
 ETAG = 'Who will escort this person?'
 EXCEL = 'Excel'
 EXPORT = 'Export'
-FACCLEAN = 'Facility Cleaning'
 FIRST = 'First'
 FIRSTNAME = 'First Name'
 FLAG = 'Flag'
@@ -69,23 +65,18 @@ ID_TYPE = 'ID Type?'
 ILLEGAL_CHARACTERS = 'Username contains illegal characters'
 IN = 'In'
 INITIALS = 'Initials'
-INSTHARD = 'Installation - Hardware'
-INSTSOFT = 'Installation - Software'
 LANG = 'Language'
 LAST = 'Last'
 LASTNAME = 'Last Name'
 LOCAL_TIME = 'Local Time'
 LOGIN = 'Login'
+LOGIN_SSO_DESCR = 'This system uses SSO authentication with your organization. Click the Login button to proceed to your organizational sign-on system and you will be returned to this application after the authentication process.'
 LOGOUT = 'Logout'
-MAINHARD = 'Maintenance - Hardware'
-MAINSOFT = 'Maintenance - Software'
-MEETING = 'Meeting'
 META_DESC = 'LobbySIO is a touchscreen-compatible signature pad/sign-in sheet webapp.'
 MIN_PASSWORD_LENGTH = 'Minimum password length is '
 NAME = 'Name'
 NEW = 'New'
 NEXT = 'Next'
-NONEAVA = 'None'
 NONO = 'No'
 NOSIGNIN = 'No sign in'
 NOSITE = 'No Site Selected'
@@ -103,13 +94,11 @@ PASSWORD_NOTMATCH = 'Passwords do not match'
 PDF = 'PDF'
 PENDINGAPPROVALS = 'Pending Approvals'
 PLEASE_LOG_IN = 'Log in for approvals and reporting'
-PREVMAIN = 'Preventive Maintenance'
 PRINT = 'Print'
 REASON = 'Reason for Facility Access'
 REASONCOMPANY = 'Company / Reason'
 REFERENCE = 'Reference'
 REFRESH = 'Refresh'
-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.'
 SELECTID = 'Select ID'
@@ -120,8 +109,6 @@ 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.'
-STR_SIGNOUT_THANKYOU_TITLE = 'Thank You!'
-STR_SIGNOUT_THANKYOU_DESC = 'You have been successfully signed out. Thank you for visiting.'
 SOFTWARE_VERSION = 'Version'
 SSANUM = 'SSA Ticket #'
 STATEID = 'State ID'
@@ -147,11 +134,12 @@ STR_COMMON_SITE = 'Site'
 STR_COMMON_START = 'Start'
 STR_COMMON_TIMEZONE = 'Timezone'
 STR_COMMON_TOUR = 'Tour'
-TOUR = 'Tour'
 STR_COMMON_VSIGNATURE = 'Visitor Signature'
 STR_COMMON_YES = 'Yes'
 STR_REPORT_EXECUTE_TITLE = 'Run Report'
 STR_SIGNIN_MANUAL = 'Manual Sign-In'
+STR_SIGNOUT_THANKYOU_DESC = 'You have been successfully signed out. Thank you for visiting.'
+STR_SIGNOUT_THANKYOU_TITLE = 'Thank You!'
 STR_TAGS_FORMCOMPLETE_TITLE = 'Complete'
 STR_TAGS_FORMINCOMPLETE_TITLE = 'Incomplete'
 STR_VENDORINFO_CHECKLISTCOMPLETED_DESC = 'If a checklist was required, has it been completed and submitted?'
@@ -169,6 +157,7 @@ STR_VENDORINFO_DOCCOMPLETED_TITLE = 'Documentation Completed'
 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_EQUIPMENTSUMMARY_DESC = 'List any special equipment or tools being utilized and any protective devices or coverings to be brought in.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE = 'Equipment Summary'
+STR_VENDORINFO_FOOTERWARNING = 'If there are any issues with any portion of the vendor form or rules, contact security immediately.'
 STR_VENDORINFO_FORM_TITLE = 'Vendor Work Form'
 STR_VENDORINFO_NONROUTINEWORK_DESC = 'Is this non-scheduled or emergency maintenance?'
 STR_VENDORINFO_NONROUTINEWORK_TITLE = 'Non-routine Work'
@@ -177,20 +166,31 @@ STR_VENDORINFO_ROUTINEWORK_TITLE = 'Routine Work'
 STR_VENDORINFO_SITECLEANUP_DESC = 'Inspect the work location and confirm all tools and materials have been removed and the site is clean.'
 STR_VENDORINFO_SITECLEANUP_TITLE = 'Site Cleanup Completed'
 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_VALIDATIONFINAL = 'Validation check items:'
+STR_VENDORINFO_VALIDATIONINITIAL = 'Initial check items:'
 STR_VENDORINFO_VENDOR_TITLE = 'Vendor'
+STR_VENDORINFO_VERIFIEDBY = 'Verified By'
 STR_VENDORINFO_WORKCOMPLETED_DESC = 'Was the work completed as discussed or promised?'
 STR_VENDORINFO_WORKCOMPLETED_TITLE = 'Work Completed'
 STR_VENDORINFO_WORKEND_TITLE = 'Work End Date'
 STR_VENDORINFO_WORKSTART_TITLE = 'Work Start Date'
 STR_VENDORINFO_WORKSUMMARY_DESC = 'Briefly summarize the work to be performed and include details of any orders relevant to the work.'
 STR_VENDORINFO_WORKSUMMARY_TITLE = 'Work Summary'
-STR_VENDORINFO_FOOTERWARNING = 'If there are any issues with any portion of the vendor form or rules, contact security immediately.'
-STR_VENDORINFO_VALIDATIONFINAL = 'Validation check items:'
-STR_VENDORINFO_VALIDATIONINITIAL = 'Initial check items:'
-STR_VENDORINFO_VERIFIEDBY = 'Verified By'
-TELCO = 'Telco/Circuit Install'
+STR_VISITTYPES_ADDEQPT = 'Add Equipment'
+STR_VISITTYPES_BRKFIX = 'Break/Fix'
+STR_VISITTYPES_FACCLEAN = 'Facility Cleaning'
+STR_VISITTYPES_INSTHARD = 'Installation - Hardware'
+STR_VISITTYPES_INSTSOFT = 'Installation - Software'
+STR_VISITTYPES_MAINHARD = 'Maintenance - Hardware'
+STR_VISITTYPES_MAINSOFT = 'Maintenance - Software'
+STR_VISITTYPES_MEETING = 'Meeting'
+STR_VISITTYPES_NONE = 'None'
+STR_VISITTYPES_PREVMAIN = 'Preventive Maintenance'
+STR_VISITTYPES_REMEQPT = 'Remove Equipment'
+STR_VISITTYPES_TELCO = 'Telco/Circuit Install'
+STR_VISITTYPES_TESTING = 'Testing'
+STR_VISITTYPES_TOUR = 'Tour'
 TERMSTITLE = 'Our Rules'
-TESTING = 'Testing'
 TICKET = 'Ticket #'
 TIMEINOUT = 'Time In / Time Out'
 TIMEREASON = 'Time & Reason'
@@ -198,6 +198,7 @@ UNAVAIL = 'Unavailable'
 USER-INFORMATION = 'User Information'
 USER-LIST-HELP = 'Edit or delete users and groups below.'
 USER-LISTHEADER = 'User List'
+USER-SITES = 'Site Management'
 USER-TYPE = 'User Type'
 USER-TYPES-ADMIN = 'Administrator'
 USER-TYPES-KIOSK = 'Kiosk'
@@ -207,7 +208,6 @@ USER-USERNAME = 'Username'
 USER-USERNAMENOTEMPTY = 'Username cannot be empty'
 USER-USERNAMEUSED = 'Username already in use'
 USER-USERS = 'User Management'
-USER-SITES = 'Site Management'
 VALIDATIONS = 'Validations'
 VISITOR = 'Visitor'
 VOID = 'Void'
diff --git a/src/Language/es.lang.ini.example b/src/Language/es.lang.ini.example
index bc276fa..ca19ac4 100644
--- a/src/Language/es.lang.ini.example
+++ b/src/Language/es.lang.ini.example
@@ -1,4 +1,3 @@
-LOGIN_SSO_DESCR = 'Este sistema utiliza la autenticación SSO con su organización. Haga clic en el botón Iniciar sesión para continuar con el sistema de inicio de sesión de su organización y volverá a esta aplicación después del proceso de autenticación.'
 ACCESS_LEVEL = 'Nivel de acceso'
 ACCOUNT = 'Cuenta'
 ACCOUNT_INFO_AUTHLOCKED = 'Este sistema utiliza autenticación SSO. Es posible que la mayoría de los detalles del usuario no se modifiquen aquí.'
@@ -9,7 +8,6 @@ ACKNOWLEDGEMENT_DOC_NAME = 'Nuestras reglas'
 ACKNOWLEDGEMENT_VENDOR_DOC_NAME = 'Reconocimiento del lugar de trabajo del proveedor'
 ACTIONS = 'Acciones por tomar'
 ACTIVEVISITS = 'Visitas activas'
-ADDEQPT = 'Agregar Equipo'
 ADD_SITE = 'Agregar sitio'
 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 '
@@ -17,7 +15,6 @@ ADMINISTRATION = 'Administración'
 APP_NAME = 'Lobby de inicio / cierre de sesión'
 BADGE = 'Numero de placa'
 BADGEINITIALS = 'Numero de placa & Sigla'
-BRKFIX = 'Romper / Arreglar'
 CARNUM = 'Numero de registro del carro'
 CITIZEN = 'Ciudadano de estados unidos?'
 COMPANY = 'Organización'
@@ -56,7 +53,6 @@ ESECTION = 'Haga clic aquí si usa una guía'
 ETAG = 'Quien escoltara a esta persona'
 EXCEL = 'Excel'
 EXPORT = 'Exportar'
-FACCLEAN = 'Limpieza de instalaciones'
 FIRST = 'Primero'
 FIRSTNAME = 'Nombre de pila'
 FLAG = 'Marcar'
@@ -69,23 +65,18 @@ ID_TYPE = 'Tipo de Identificación?'
 ILLEGAL_CHARACTERS = 'Nombre de usuario contiene caracteres no válidos'
 IN = 'Hora de llegada'
 INITIALS = 'La sigla'
-INSTHARD = 'Instalación de Hardware'
-INSTSOFT = 'Instalación de Software'
 LANG = 'Idioma'
 LAST = 'Apellido'
 LASTNAME = 'Apellido'
 LOCAL_TIME = 'Tiempo actual'
 LOGIN = 'Iniciar sesión'
+LOGIN_SSO_DESCR = 'Este sistema utiliza la autenticación SSO con su organización. Haga clic en el botón Iniciar sesión para continuar con el sistema de inicio de sesión de su organización y volverá a esta aplicación después del proceso de autenticación.'
 LOGOUT = 'Cerrar sesión'
-MAINHARD = 'Mantenimiento de Hardware'
-MAINSOFT = 'Mantenimiento de Software'
-MEETING = 'Cita'
 META_DESC = 'LobbySIO es una aplicación web compatible con pantalla táctil compatible con pantalla táctil.'
 MIN_PASSWORD_LENGTH = 'La longitud mínima de la contraseña es '
 NAME = 'Nombre'
 NEW = 'Nuevo'
 NEXT = 'Siguiente'
-NONEAVA = 'Nada'
 NONO = 'No'
 NOSIGNIN = 'No completó'
 NOSITE = 'Ningún sitio seleccionado'
@@ -103,13 +94,11 @@ PASSWORD_NOTMATCH = 'Las contraseñas no coinciden'
 PDF = 'PDF'
 PENDINGAPPROVALS = 'Aprobaciones pendientes'
 PLEASE_LOG_IN = 'Inicie sesión para aprobaciones y reportes'
-PREVMAIN = 'Mantenimiento preventivo'
 PRINT = 'Impresión'
 REASON = 'Razón para el acceso a las instalaciones'
 REASONCOMPANY = 'Empresa / Razón'
 REFERENCE = 'Referencia'
 REFRESH = 'Recargar'
-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.'
 SELECTID = 'Por favor seleccione'
@@ -120,8 +109,6 @@ 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.'
-STR_SIGNOUT_THANKYOU_TITLE = '¡Gracias!'
-STR_SIGNOUT_THANKYOU_DESC = 'Se ha cerrado correctamente. Gracias por su visita.'
 SOFTWARE_VERSION = 'Versión del software'
 SSANUM = 'Número de boleto de la SSA'
 STATEID = 'Identificación del estado'
@@ -147,11 +134,12 @@ STR_COMMON_SITE = 'Sitio'
 STR_COMMON_START = 'Comienzo'
 STR_COMMON_TIMEZONE = 'Zona horaria'
 STR_COMMON_TOUR = 'Visitar'
-TOUR = 'Visitar'
 STR_COMMON_VSIGNATURE = 'Firma del Visitante'
 STR_COMMON_YES = 'Sí'
 STR_REPORT_EXECUTE_TITLE = 'Sacar un reporte'
 STR_SIGNIN_MANUAL = 'Inicio de sesión manual'
+STR_SIGNOUT_THANKYOU_DESC = 'Se ha cerrado correctamente. Gracias por su visita.'
+STR_SIGNOUT_THANKYOU_TITLE = '¡Gracias!'
 STR_TAGS_FORMCOMPLETE_TITLE = 'Completo'
 STR_TAGS_FORMINCOMPLETE_TITLE = 'Incompleto'
 STR_VENDORINFO_CHECKLISTCOMPLETED_DESC = 'Si se requirió una lista de verificación, ¿se ha completado y enviado?'
@@ -169,6 +157,7 @@ STR_VENDORINFO_DOCCOMPLETED_TITLE = 'Documentación completada'
 STR_VENDORINFO_DOCUMENTATIONREQUIRED_DESC = 'AVISO: todos los proveedores deben completar un Método de procedimiento, utilizar una lista de verificación preautorizada o un formulario estándar aprobado por la empresa para documentar el trabajo que se debe completar.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_DESC = 'Enumere cualquier equipo o herramienta especial que se esté utilizando y cualquier dispositivo de protección o cubierta que deba llevarse.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE = 'Resumen de equipo'
+STR_VENDORINFO_FOOTERWARNING = 'Si hay algún problema con alguna parte del formulario o las reglas del proveedor, comuníquese con seguridad de inmediato.'
 STR_VENDORINFO_FORM_TITLE = 'Formulario de trabajo del proveedor'
 STR_VENDORINFO_NONROUTINEWORK_DESC = '¿Se trata de un mantenimiento no programado o de emergencia?'
 STR_VENDORINFO_NONROUTINEWORK_TITLE = 'Trabajo no rutinario'
@@ -177,20 +166,31 @@ STR_VENDORINFO_ROUTINEWORK_TITLE = 'Trabajo rutinario'
 STR_VENDORINFO_SITECLEANUP_DESC = 'Inspeccione el lugar de trabajo y confirme que se hayan retirado todas las herramientas y materiales y que el sitio esté limpio.'
 STR_VENDORINFO_SITECLEANUP_TITLE = 'Limpieza del sitio completada'
 STR_VENDORINFO_UNABLETOSIGNOUT_DESC = 'La empresa aún no ha completado el Formulario de trabajo del proveedor, solicite al personal de seguridad que lo complete para cerrar la sesión.'
+STR_VENDORINFO_VALIDATIONFINAL = 'Elementos de verificación de validación:'
+STR_VENDORINFO_VALIDATIONINITIAL = 'Elementos de verificación inicial:'
 STR_VENDORINFO_VENDOR_TITLE = 'Vendedor'
+STR_VENDORINFO_VERIFIEDBY = 'Verificada por'
 STR_VENDORINFO_WORKCOMPLETED_DESC = '¿Se completó el trabajo como se discutió o prometió?'
 STR_VENDORINFO_WORKCOMPLETED_TITLE = 'Trabajo completado'
 STR_VENDORINFO_WORKEND_TITLE = 'Fecha de finalización del trabajo'
 STR_VENDORINFO_WORKSTART_TITLE = 'Fecha de inicio del trabajo'
 STR_VENDORINFO_WORKSUMMARY_DESC = 'Resuma brevemente el trabajo a realizar e incluya detalles de cualquier orden relevante para el trabajo.'
 STR_VENDORINFO_WORKSUMMARY_TITLE = 'Resumen de trabajo'
-STR_VENDORINFO_FOOTERWARNING = 'Si hay algún problema con alguna parte del formulario o las reglas del proveedor, comuníquese con seguridad de inmediato.'
-STR_VENDORINFO_VALIDATIONFINAL = 'Elementos de verificación de validación:'
-STR_VENDORINFO_VALIDATIONINITIAL = 'Elementos de verificación inicial:'
-STR_VENDORINFO_VERIFIEDBY = 'Verificada por'
-TELCO = 'Instalación de Telco / Circuito'
+STR_VISITTYPES_ADDEQPT = 'Agregar Equipo'
+STR_VISITTYPES_BRKFIX = 'Romper / Arreglar'
+STR_VISITTYPES_FACCLEAN = 'Limpieza de instalaciones'
+STR_VISITTYPES_INSTHARD = 'Instalación de Hardware'
+STR_VISITTYPES_INSTSOFT = 'Instalación de Software'
+STR_VISITTYPES_MAINHARD = 'Mantenimiento de Hardware'
+STR_VISITTYPES_MAINSOFT = 'Mantenimiento de Software'
+STR_VISITTYPES_MEETING = 'Cita'
+STR_VISITTYPES_NONE = 'Nada'
+STR_VISITTYPES_PREVMAIN = 'Mantenimiento preventivo'
+STR_VISITTYPES_REMEQPT = 'Llevar Equipo'
+STR_VISITTYPES_TELCO = 'Instalación de Telco / Circuito'
+STR_VISITTYPES_TESTING = 'Ensayo'
+STR_VISITTYPES_TOUR = 'Visitar'
 TERMSTITLE = 'Nuestras reglas'
-TESTING = 'Ensayo'
 TICKET = 'Billete #'
 TIMEINOUT = 'Tiempo de inicio / fin de tiempo'
 TIMEREASON = 'Tiempo y razon'
@@ -198,6 +198,7 @@ UNAVAIL = 'Indisponible'
 USER-INFORMATION = 'Informacion del usuario'
 USER-LIST-HELP = 'Edite o elimine usuarios y grupos a continuación.'
 USER-LISTHEADER = 'Lista de usuarios'
+USER-SITES = 'Manejo de sitio'
 USER-TYPE = 'Tipo de usuario'
 USER-TYPES-ADMIN = 'Administrador'
 USER-TYPES-KIOSK = 'Quiosco'
@@ -207,7 +208,6 @@ USER-USERNAME = 'Usuario'
 USER-USERNAMENOTEMPTY = 'El nombre de usuario no puede estar vacío'
 USER-USERNAMEUSED = 'Nombre de usuario ya está en uso'
 USER-USERS = 'Gestión de usuarios'
-USER-SITES = 'Manejo de sitio'
 VALIDATIONS = 'Validaciones'
 VISITOR = 'Visitante'
 VOID = 'Invalidar'
diff --git a/src/Language/fr.lang.ini.example b/src/Language/fr.lang.ini.example
index f78188b..9a83268 100644
--- a/src/Language/fr.lang.ini.example
+++ b/src/Language/fr.lang.ini.example
@@ -1,4 +1,3 @@
-LOGIN_SSO_DESCR = 'Ce système utilise l&#39;authentification SSO avec votre organisation. Cliquez sur le bouton Connexion pour accéder à votre système de connexion organisationnel et vous serez renvoyé à cette application après le processus d&#39;authentification.'
 ACCESS_LEVEL = 'Niveau d&#39;accès'
 ACCOUNT = 'Compte'
 ACCOUNT_INFO_AUTHLOCKED = 'Ce système utilise l&#39;authentification SSO. La plupart des détails de l&#39;utilisateur ne peuvent pas être modifiés ici.'
@@ -9,7 +8,6 @@ ACKNOWLEDGEMENT_DOC_NAME = 'Nos règles'
 ACKNOWLEDGEMENT_VENDOR_DOC_NAME = 'Accusé de réception de chantier du fournisseur'
 ACTIONS = 'Actions'
 ACTIVEVISITS = 'Visites actives'
-ADDEQPT = 'Ajouter un équipement'
 ADD_SITE = 'Ajouter un site'
 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 '
@@ -17,7 +15,6 @@ ADMINISTRATION = 'Administration'
 APP_NAME = 'Vestibule register/se désinscrire'
 BADGE = 'Numéro de badge'
 BADGEINITIALS = 'Numéro de badge & Initiales'
-BRKFIX = 'Rupture/Réparation'
 CARNUM = 'Numéro d&#39;immatriculation'
 CITIZEN = 'Citoyen?'
 COMPANY = 'Organisation'
@@ -56,7 +53,6 @@ ESECTION = 'Cliquez ici si une escorte est requise'
 ETAG = 'Qui escortera cette personne?'
 EXCEL = 'Excel'
 EXPORT = 'Exportation'
-FACCLEAN = 'Nettoyage des installations'
 FIRST = 'Prénom'
 FIRSTNAME = 'Prénom'
 FLAG = 'Marque'
@@ -69,23 +65,18 @@ ID_TYPE = 'Type d&#39;identification?'
 ILLEGAL_CHARACTERS = 'Le nom d&#39;utilisateur contient des caractères illégaux'
 IN = 'Dans'
 INITIALS = 'Initiales'
-INSTHARD = 'Installation de matériel'
-INSTSOFT = 'Installation de logiciel'
 LANG = 'La langue'
 LAST = 'Nom de famille'
 LASTNAME = 'Nom de famille'
 LOCAL_TIME = 'Heure locale'
 LOGIN = 'S&#39;identifier'
+LOGIN_SSO_DESCR = 'Ce système utilise l&#39;authentification SSO avec votre organisation. Cliquez sur le bouton Connexion pour accéder à votre système de connexion organisationnel et vous serez renvoyé à cette application après le processus d&#39;authentification.'
 LOGOUT = 'Connectez - Out'
-MAINHARD = 'Maintenance du Hardware'
-MAINSOFT = 'Maintenance du Software'
-MEETING = 'Réunion'
 META_DESC = 'LobbySIO est une application Web pour tablette de signature / feuille de connexion compatible avec les écrans tactiles.'
 MIN_PASSWORD_LENGTH = 'La longueur minimale du mot de passe est '
 NAME = 'Nom complet'
 NEW = 'Nouveau'
 NEXT = 'Suivant'
-NONEAVA = 'Aucun'
 NONO = 'Non'
 NOSIGNIN = 'Pas de connexion'
 NOSITE = 'Aucun site sélectionné'
@@ -103,13 +94,11 @@ PASSWORD_NOTMATCH = 'Les mots de passe ne correspondent pas'
 PDF = 'PDF'
 PENDINGAPPROVALS = 'En attente d`approbation'
 PLEASE_LOG_IN = 'Connectez-vous pour les approbations et les rapports'
-PREVMAIN = 'Maintenance préventive'
 PRINT = 'Impression'
 REASON = 'Raison de l&#39;accès aux installations'
 REASONCOMPANY = 'Organisation / Raison'
 REFERENCE = 'Reference'
 REFRESH = 'Actualiser'
-REMEQPT = 'Retirer l&#39;équipement'
 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.'
 SELECTID = 'Sélectionnez l&#39;identifiant'
@@ -120,8 +109,6 @@ SIGNINBY = 'Vérifié par'
 SIGNIN_THANKYOU = 'Merci pour votre connexion. Nous attribuerons un badge dans quelques instants.'
 SIGNOUT = 'Se déconnecter'
 SIGNOUT_THANKYOU = 'Merci - vous avez été déconnecté avec succès.'
-STR_SIGNOUT_THANKYOU_TITLE = 'Merci!'
-STR_SIGNOUT_THANKYOU_DESC = 'Vous avez été déconnecté avec succès. Merci pour votre visite.'
 SOFTWARE_VERSION = 'Version'
 SSANUM = 'Numéro de billet SSA'
 STATEID = 'Identifiant d&#39;état'
@@ -147,11 +134,12 @@ STR_COMMON_SITE = 'Le site'
 STR_COMMON_START = 'Début'
 STR_COMMON_TIMEZONE = 'Fuseau horaire'
 STR_COMMON_TOUR = 'Visiter'
-TOUR = 'Visiter'
 STR_COMMON_VSIGNATURE = 'Visiteur Signature'
 STR_COMMON_YES = 'Oui'
 STR_REPORT_EXECUTE_TITLE = 'Rapport d&#39;exécution'
 STR_SIGNIN_MANUAL = 'Connexion manuelle'
+STR_SIGNOUT_THANKYOU_DESC = 'Vous avez été déconnecté avec succès. Merci pour votre visite.'
+STR_SIGNOUT_THANKYOU_TITLE = 'Merci!'
 STR_TAGS_FORMCOMPLETE_TITLE = 'Rempli'
 STR_TAGS_FORMINCOMPLETE_TITLE = 'Incomplet'
 STR_VENDORINFO_CHECKLISTCOMPLETED_DESC = 'Si une liste de contrôle était requise, a-t-elle été complétée et soumise ?'
@@ -169,6 +157,7 @@ STR_VENDORINFO_DOCCOMPLETED_TITLE = 'Documentation terminée'
 STR_VENDORINFO_DOCUMENTATIONREQUIRED_DESC = 'AVIS - Tous les fournisseurs sont tenus de remplir une méthode de procédure, d&#39;utiliser une liste de contrôle préautorisée ou un formulaire standard approuvé par l&#39;entreprise pour documenter le travail à effectuer.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_DESC = 'Énumérez tout équipement ou outil spécial utilisé et tout dispositif de protection ou revêtement à apporter.'
 STR_VENDORINFO_EQUIPMENTSUMMARY_TITLE = 'Résumé de l&#39;équipement'
+STR_VENDORINFO_FOOTERWARNING = 'S&#39;il y a des problèmes avec une partie du formulaire ou des règles du fournisseur, contactez immédiatement la sécurité.'
 STR_VENDORINFO_FORM_TITLE = 'Formulaire de travail du fournisseur'
 STR_VENDORINFO_NONROUTINEWORK_DESC = 'S&#39;agit-il d&#39;une maintenance non programmée ou d&#39;urgence ?'
 STR_VENDORINFO_NONROUTINEWORK_TITLE = 'Travail non routinier'
@@ -177,20 +166,31 @@ STR_VENDORINFO_ROUTINEWORK_TITLE = 'Travail de routine'
 STR_VENDORINFO_SITECLEANUP_DESC = 'Inspectez le lieu de travail et confirmez que tous les outils et matériaux ont été retirés et que le site est propre.'
 STR_VENDORINFO_SITECLEANUP_TITLE = 'Nettoyage du site terminé'
 STR_VENDORINFO_UNABLETOSIGNOUT_DESC = 'Le formulaire de travail du fournisseur n&#39;a pas encore été rempli par l&#39;entreprise, veuillez demander à la sécurité de remplir le formulaire afin de vous déconnecter.'
+STR_VENDORINFO_VALIDATIONFINAL = 'Éléments de contrôle de validation :'
+STR_VENDORINFO_VALIDATIONINITIAL = 'Éléments de contrôle initiaux :'
 STR_VENDORINFO_VENDOR_TITLE = 'Vendeur'
+STR_VENDORINFO_VERIFIEDBY = 'Vérifié par'
 STR_VENDORINFO_WORKCOMPLETED_DESC = 'Le travail a-t-il été terminé comme discuté ou promis?'
 STR_VENDORINFO_WORKCOMPLETED_TITLE = 'Travaux achevés'
 STR_VENDORINFO_WORKEND_TITLE = 'Date de fin de travail'
 STR_VENDORINFO_WORKSTART_TITLE = 'Date de début de travail'
 STR_VENDORINFO_WORKSUMMARY_DESC = 'Résumez brièvement le travail à effectuer et incluez les détails de toute commande pertinente au travail.'
 STR_VENDORINFO_WORKSUMMARY_TITLE = 'Résumé du travail'
-STR_VENDORINFO_FOOTERWARNING = 'S&#39;il y a des problèmes avec une partie du formulaire ou des règles du fournisseur, contactez immédiatement la sécurité.'
-STR_VENDORINFO_VALIDATIONFINAL = 'Éléments de contrôle de validation :'
-STR_VENDORINFO_VALIDATIONINITIAL = 'Éléments de contrôle initiaux :'
-STR_VENDORINFO_VERIFIEDBY = 'Vérifié par'
-TELCO = 'Installation de télécommunications/circuit'
+STR_VISITTYPES_ADDEQPT = 'Ajouter un équipement'
+STR_VISITTYPES_BRKFIX = 'Rupture/Réparation'
+STR_VISITTYPES_FACCLEAN = 'Nettoyage des installations'
+STR_VISITTYPES_INSTHARD = 'Installation de matériel'
+STR_VISITTYPES_INSTSOFT = 'Installation de logiciel'
+STR_VISITTYPES_MAINHARD = 'Maintenance du Hardware'
+STR_VISITTYPES_MAINSOFT = 'Maintenance du Software'
+STR_VISITTYPES_MEETING = 'Réunion'
+STR_VISITTYPES_NONE = 'Aucun'
+STR_VISITTYPES_PREVMAIN = 'Maintenance préventive'
+STR_VISITTYPES_REMEQPT = 'Retirer l&#39;équipement'
+STR_VISITTYPES_TELCO = 'Installation de télécommunications/circuit'
+STR_VISITTYPES_TESTING = 'Essai'
+STR_VISITTYPES_TOUR = 'Visiter'
 TERMSTITLE = 'Nos règles'
-TESTING = 'Essai'
 TICKET = 'Billet #'
 TIMEINOUT = 'Temps d&#39;entrée / Temps d&#39;arrêt'
 TIMEREASON = 'Temps et raison'
@@ -198,6 +198,7 @@ UNAVAIL = 'Indisponible'
 USER-INFORMATION = 'Informations de l&#39;utilisateur'
 USER-LIST-HELP = 'Modifier ou supprimer des utilisateurs et des groupes ci-dessous.'
 USER-LISTHEADER = 'Liste d&#39;utilisateur'
+USER-SITES = 'Administration du site'
 USER-TYPE = 'Type d&#39;utilisateur'
 USER-TYPES-ADMIN = 'Administrateur'
 USER-TYPES-KIOSK = 'Kiosque'
@@ -207,7 +208,6 @@ USER-USERNAME = 'Nom d&#39;utilisateur'
 USER-USERNAMENOTEMPTY = 'Le nom d&#39;utilisateur ne peut pas être vide'
 USER-USERNAMEUSED = 'Nom d&#39;utilisateur déjà utilisé'
 USER-USERS = 'Gestion des utilisateurs'
-USER-SITES = 'Administration du site'
 VALIDATIONS = 'Endossements'
 VISITOR = 'Visiteur'
 VOID = 'Vide'
diff --git a/users.php b/users.php
index ec36410..88b1062 100644
--- a/users.php
+++ b/users.php
@@ -84,22 +84,25 @@
 
 <?php if (isset($session_user)) { if($session_user["0"]["users_usertype"] !== "USER-TYPES-ADMIN") { header("Location: index.php"); ?><h2 class="content-subhead"><?php echo $transLang['NOT_AUTHORIZED']; ?></h2><?php } } ?>
 
-<?php $minpasslength = $StaticFunctions->getMinPass(); ?>
+<?php                                                                           // FILTER POSTED DATA
+$form_data = filter_input_array(INPUT_POST, [
+  'edituser' => (string)FILTER_SANITIZE_STRING,
+  'fd_editUserId' => (string)FILTER_SANITIZE_STRING,
+  'fd_initialPassword' => (string)FILTER_SANITIZE_STRING,
+  'fd_confirmPassword' => (string)FILTER_SANITIZE_STRING,
+  'fd_firstName' => (string)FILTER_SANITIZE_STRING,
+  'fd_lastName' => (string)FILTER_SANITIZE_STRING,
+  'fd_userEmail' => (string)FILTER_SANITIZE_STRING
+]);
+?>
+
+<?php                                                                           // PAGE CONSTANTS
+  $selfName = (string)'users.php';                                              // PAGE URL
+  $minpasslength = $StaticFunctions->getMinPass();                              // MINIMUM PASSWORD LENGTH
+?>
 
 <?php
-// FILTER POSTED DATA
-$form_data = filter_input_array(INPUT_POST, [
-    'edituser' => (string)FILTER_SANITIZE_STRING,
-    'editid' => (string)FILTER_SANITIZE_STRING,
-    'form_data_passwordconfirm' => (string)FILTER_SANITIZE_STRING,
-    'form_data_firstname' => (string)FILTER_SANITIZE_STRING,
-    'form_data_lastname' => (string)FILTER_SANITIZE_STRING,
-    'form_data_email' => (string)FILTER_SANITIZE_STRING
-]);
-
-
-
-if (!empty($form_data['edituser'])) { $edituser = $Users->getUserInfo($form_data['editid'], "0", "0") ?>
+if (!empty($form_data['edituser'])) { $edituser = $Users->getUserInfo($form_data['fd_editUserId'], "0", "0") ?>
 <!-- USER EDIT SECTION -->
   <div class="container-fluid">
     <form method="post">
@@ -355,7 +358,7 @@ if (0 === $row_count): else: $page_count = (int)ceil($row_count / $StaticFunctio
             <td class="nowrap">
               <form method="post">
                 <input type="hidden" id="_METHOD" name="_METHOD" value="EDITUSER" />
-                <input type="hidden" id="editid" name="editid" value="<?php echo $row['users_id']; ?>" />
+                <input type="hidden" id="fd_editUserId" name="fd_editUserId" value="<?php echo $row['users_id']; ?>" />
                 <button class="btn btn-primary btn-sm" id="edituser" name="edituser" value="edituser" type="submit" <?php if ($row['users_username'] == "admin"): echo "disabled"; endif; if ($row['users_username'] == "KIOSK"): echo "disabled"; endif; ?>><i class="fa fa-edit"></i> </button>
               </form>
               <form method="post" onsubmit="return confirm('<?php echo $transLang['DELETE_WARNING']; ?>')">