diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 134f296..62d8f58 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -123,4 +123,5 @@ return ['ClientManagement' => [
     'Wire'           => 'Wire',
     'YTDSales'       => 'YTD Sales',
     'Zip'            => 'Zip',
+    'IMG_alt_map'            => 'Map',
 ]];
diff --git a/Theme/Backend/client-analysis.tpl.php b/Theme/Backend/client-analysis.tpl.php
index eda8008..096060b 100755
--- a/Theme/Backend/client-analysis.tpl.php
+++ b/Theme/Backend/client-analysis.tpl.php
@@ -103,7 +103,7 @@ echo $this->getData('nav')->render();
                             Sales / Customers - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('monthlySalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -111,7 +111,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $monthly) {
+                                                        foreach ($saleCustomer as $monthly) {
                                                             $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
                                                         }
                                                     ?>
@@ -124,7 +124,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['customers']);
                                                                 }
                                                             ?>
@@ -142,7 +142,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -185,7 +185,7 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-customer-sales" type="checkbox">
+                                <input id="more-customer-sales" type="checkbox" name="more-container">
                                 <label for="more-customer-sales">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -201,7 +201,7 @@ echo $this->getData('nav')->render();
                                         <?php
                                             $sum1 = 0;
                                             $sum2 = 0;
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                             $sum1 += ((int) $values['net_sales']) / 1000;
                                             $sum2 += ((int) $values['customers']);
                                         ?>
@@ -227,7 +227,7 @@ echo $this->getData('nav')->render();
                             Sales / Customers - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('annualSalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -235,7 +235,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $annual) {
+                                                        foreach ($saleCustomer as $annual) {
                                                             $temp[] = $annual['year'];
                                                         }
                                                     ?>
@@ -248,7 +248,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['customers']);
                                                                 }
                                                             ?>
@@ -266,7 +266,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -309,7 +309,7 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-customer-sales-annual" type="checkbox">
+                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-sales-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -323,7 +323,7 @@ echo $this->getData('nav')->render();
                                             <td>Customer count
                                     <tbody>
                                         <?php
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                         ?>
                                             <tr>
                                                 <td><?= (string) $values['year']; ?>
@@ -379,7 +379,7 @@ echo $this->getData('nav')->render();
                                 }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-region" type="checkbox">
+                                <input id="more-customer-region" type="checkbox" name="more-container">
                                 <label for="more-customer-region">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -568,7 +568,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-region-annual" type="checkbox">
+                                <input id="more-customer-region-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-region-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -654,7 +654,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-rep-current" type="checkbox">
+                                <input id="more-customer-rep-current" type="checkbox" name="more-container">
                                 <label for="more-customer-rep-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -766,7 +766,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-country-current" type="checkbox">
+                                <input id="more-customer-country-current" type="checkbox" name="more-container">
                                 <label for="more-customer-country-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -889,7 +889,7 @@ echo $this->getData('nav')->render();
                             </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox">
+                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1087,7 +1087,7 @@ echo $this->getData('nav')->render();
                                 </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox">
+                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1183,7 +1183,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-retention" type="checkbox">
+                                <input id="more-customer-retention" type="checkbox" name="more-container">
                                 <label for="more-customer-retention">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1225,7 +1225,7 @@ echo $this->getData('nav')->render();
                             Sales / New Customers - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('monthlySalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -1233,7 +1233,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $monthly) {
+                                                        foreach ($saleCustomer as $monthly) {
                                                             $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
                                                         }
                                                     ?>
@@ -1246,7 +1246,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['customers']);
                                                                 }
                                                             ?>
@@ -1264,7 +1264,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -1307,7 +1307,7 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-customer-sales" type="checkbox">
+                                <input id="more-customer-sales" type="checkbox" name="more-container">
                                 <label for="more-customer-sales">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1323,7 +1323,7 @@ echo $this->getData('nav')->render();
                                         <?php
                                             $sum1 = 0;
                                             $sum2 = 0;
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                             $sum1 += ((int) $values['net_sales']) / 1000;
                                             $sum2 += ((int) $values['customers']);
                                         ?>
@@ -1349,7 +1349,7 @@ echo $this->getData('nav')->render();
                             Sales / New Customers - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('annualSalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -1357,7 +1357,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $annual) {
+                                                        foreach ($saleCustomer as $annual) {
                                                             $temp[] = $annual['year'];
                                                         }
                                                     ?>
@@ -1370,7 +1370,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['customers']);
                                                                 }
                                                             ?>
@@ -1388,7 +1388,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -1431,7 +1431,7 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-customer-sales-annual" type="checkbox">
+                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-sales-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1445,7 +1445,7 @@ echo $this->getData('nav')->render();
                                             <td>Customer count
                                     <tbody>
                                         <?php
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                         ?>
                                             <tr>
                                                 <td><?= (string) $values['year']; ?>
@@ -1501,7 +1501,7 @@ echo $this->getData('nav')->render();
                                 }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-region" type="checkbox">
+                                <input id="more-customer-region" type="checkbox" name="more-container">
                                 <label for="more-customer-region">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1690,7 +1690,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-region-annual" type="checkbox">
+                                <input id="more-customer-region-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-region-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1776,7 +1776,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-rep-current" type="checkbox">
+                                <input id="more-customer-rep-current" type="checkbox" name="more-container">
                                 <label for="more-customer-rep-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -1888,7 +1888,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-country-current" type="checkbox">
+                                <input id="more-customer-country-current" type="checkbox" name="more-container">
                                 <label for="more-customer-country-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2011,7 +2011,7 @@ echo $this->getData('nav')->render();
                             </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox">
+                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2209,7 +2209,7 @@ echo $this->getData('nav')->render();
                                 </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox">
+                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2290,7 +2290,7 @@ echo $this->getData('nav')->render();
                             Sales / Lost Customers - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('monthlySalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -2298,7 +2298,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $monthly) {
+                                                        foreach ($saleCustomer as $monthly) {
                                                             $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
                                                         }
                                                     ?>
@@ -2311,7 +2311,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['customers']);
                                                                 }
                                                             ?>
@@ -2329,7 +2329,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -2372,7 +2372,7 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-customer-sales" type="checkbox">
+                                <input id="more-customer-sales" type="checkbox" name="more-container">
                                 <label for="more-customer-sales">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2388,7 +2388,7 @@ echo $this->getData('nav')->render();
                                         <?php
                                             $sum1 = 0;
                                             $sum2 = 0;
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                             $sum1 += ((int) $values['net_sales']) / 1000;
                                             $sum2 += ((int) $values['customers']);
                                         ?>
@@ -2414,7 +2414,7 @@ echo $this->getData('nav')->render();
                             Sales / Sales Customers - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('annualSalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -2422,7 +2422,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $annual) {
+                                                        foreach ($saleCustomer as $annual) {
                                                             $temp[] = $annual['year'];
                                                         }
                                                     ?>
@@ -2435,7 +2435,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['customers']);
                                                                 }
                                                             ?>
@@ -2453,7 +2453,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -2496,7 +2496,7 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-customer-sales-annual" type="checkbox">
+                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-sales-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2510,7 +2510,7 @@ echo $this->getData('nav')->render();
                                             <td>Customer count
                                     <tbody>
                                         <?php
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                         ?>
                                             <tr>
                                                 <td><?= (string) $values['year']; ?>
@@ -2566,7 +2566,7 @@ echo $this->getData('nav')->render();
                                 }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-region" type="checkbox">
+                                <input id="more-customer-region" type="checkbox" name="more-container">
                                 <label for="more-customer-region">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2755,7 +2755,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-region-annual" type="checkbox">
+                                <input id="more-customer-region-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-region-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2841,7 +2841,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-rep-current" type="checkbox">
+                                <input id="more-customer-rep-current" type="checkbox" name="more-container">
                                 <label for="more-customer-rep-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -2953,7 +2953,7 @@ echo $this->getData('nav')->render();
                                     }'></canvas>
 
                             <div class="more-container">
-                                <input id="more-customer-country-current" type="checkbox">
+                                <input id="more-customer-country-current" type="checkbox" name="more-container">
                                 <label for="more-customer-country-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -3076,7 +3076,7 @@ echo $this->getData('nav')->render();
                             </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox">
+                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -3274,7 +3274,7 @@ echo $this->getData('nav')->render();
                                 </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox">
+                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -3371,7 +3371,7 @@ echo $this->getData('nav')->render();
                             Sales / Profit - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('monthlySalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -3379,7 +3379,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $monthly) {
+                                                        foreach ($saleCustomer as $monthly) {
                                                             $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
                                                         }
                                                     ?>
@@ -3392,7 +3392,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['customers']);
                                                                 }
                                                             ?>
@@ -3410,7 +3410,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -3453,8 +3453,8 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-scustomer-sales" type="checkbox">
-                                <label for="more-scustomer-sales">
+                                <input id="more-customer-sales" type="checkbox" name="more-container">
+                                <label for="more-customer-sales">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
                                 </label>
@@ -3470,7 +3470,7 @@ echo $this->getData('nav')->render();
                                         <?php
                                             $sum1 = 0;
                                             $sum2 = 0;
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                             $sum1 += ((int) $values['net_sales']) / 1000;
                                             $sum2 += ((int) $values['customers']);
                                         ?>
@@ -3498,7 +3498,7 @@ echo $this->getData('nav')->render();
                             Sales / Profit - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('annualSalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -3506,7 +3506,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $annual) {
+                                                        foreach ($saleCustomer as $annual) {
                                                             $temp[] = $annual['year'];
                                                         }
                                                     ?>
@@ -3519,7 +3519,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['customers']);
                                                                 }
                                                             ?>
@@ -3537,7 +3537,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -3580,8 +3580,8 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-scustomer-sales-annual" type="checkbox">
-                                <label for="more-scustomer-sales-annual">
+                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
+                                <label for="more-customer-sales-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
                                 </label>
@@ -3595,7 +3595,7 @@ echo $this->getData('nav')->render();
                                             <td>Profit %
                                     <tbody>
                                         <?php
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                         ?>
                                             <tr>
                                                 <td><?= (string) $values['year']; ?>
@@ -3668,7 +3668,7 @@ echo $this->getData('nav')->render();
                             </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox">
+                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -3866,7 +3866,7 @@ echo $this->getData('nav')->render();
                                 </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox">
+                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -3961,7 +3961,7 @@ echo $this->getData('nav')->render();
                             </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-current" type="checkbox">
+                                <input id="more-customer-attribute-current" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-current">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -4159,7 +4159,7 @@ echo $this->getData('nav')->render();
                                 </div>
 
                             <div class="more-container">
-                                <input id="more-customer-attribute-annual" type="checkbox">
+                                <input id="more-customer-attribute-annual" type="checkbox" name="more-container">
                                 <label for="more-customer-attribute-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
@@ -4202,7 +4202,7 @@ echo $this->getData('nav')->render();
                             Invoices / Articles - Monthly
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('monthlySalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('monthlySaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-region" data-chart='{
                                             "type": "bar",
@@ -4210,7 +4210,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $monthly) {
+                                                        foreach ($saleCustomer as $monthly) {
                                                             $temp[] = $monthly['month'] . '/' . \substr((string) $monthly['year'], -2);
                                                         }
                                                     ?>
@@ -4223,7 +4223,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['customers']);
                                                                 }
                                                             ?>
@@ -4241,7 +4241,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $monthly) {
+                                                                foreach ($saleCustomer as $monthly) {
                                                                     $temp[] = ((int) $monthly['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -4284,8 +4284,8 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-scustomer-sales" type="checkbox">
-                                <label for="more-scustomer-sales">
+                                <input id="more-customer-sales" type="checkbox" name="more-container">
+                                <label for="more-customer-sales">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
                                 </label>
@@ -4300,7 +4300,7 @@ echo $this->getData('nav')->render();
                                         <?php
                                             $sum1 = 0;
                                             $sum2 = 0;
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                             $sum1 += ((int) $values['net_sales']) / 1000;
                                             $sum2 += ((int) $values['customers']);
                                         ?>
@@ -4328,7 +4328,7 @@ echo $this->getData('nav')->render();
                             Invoices / Articles - Annual
                             <?php include __DIR__ . '/../../../../Web/Backend/Themes/popup-export-data.tpl.php'; ?>
                         </div>
-                        <?php $salesCustomer = $this->getData('annualSalesCustomer'); ?>
+                        <?php $saleCustomer = $this->getData('annualSaleCustomer'); ?>
                         <div class="portlet-body">
                             <canvas id="sales-customer-annual" data-chart='{
                                             "type": "bar",
@@ -4336,7 +4336,7 @@ echo $this->getData('nav')->render();
                                                 "labels": [
                                                     <?php
                                                         $temp = [];
-                                                        foreach ($salesCustomer as $annual) {
+                                                        foreach ($saleCustomer as $annual) {
                                                             $temp[] = $annual['year'];
                                                         }
                                                     ?>
@@ -4349,7 +4349,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['customers']);
                                                                 }
                                                             ?>
@@ -4367,7 +4367,7 @@ echo $this->getData('nav')->render();
                                                         "data": [
                                                             <?php
                                                                 $temp = [];
-                                                                foreach ($salesCustomer as $annual) {
+                                                                foreach ($saleCustomer as $annual) {
                                                                     $temp[] = ((int) $annual['net_sales']) / 1000;
                                                                 }
                                                             ?>
@@ -4410,8 +4410,8 @@ echo $this->getData('nav')->render();
                                             }
                                     }'></canvas>
                             <div class="more-container">
-                                <input id="more-scustomer-sales-annual" type="checkbox">
-                                <label for="more-scustomer-sales-annual">
+                                <input id="more-customer-sales-annual" type="checkbox" name="more-container">
+                                <label for="more-customer-sales-annual">
                                     <span>Data</span>
                                     <i class="fa fa-chevron-right expand"></i>
                                 </label>
@@ -4424,7 +4424,7 @@ echo $this->getData('nav')->render();
                                             <td>Articles
                                     <tbody>
                                         <?php
-                                        foreach ($salesCustomer as $values) :
+                                        foreach ($saleCustomer as $values) :
                                         ?>
                                             <tr>
                                                 <td><?= (string) $values['year']; ?>
diff --git a/Theme/Backend/client-create.tpl.php b/Theme/Backend/client-create.tpl.php
index 2c83d86..67c9989 100755
--- a/Theme/Backend/client-create.tpl.php
+++ b/Theme/Backend/client-create.tpl.php
@@ -49,7 +49,7 @@ echo $this->getData('nav')->render(); ?>
                                     <tr><td><input type="text" id="iName2" name="name2" placeholder="&#xf040;">
                                     <tr><td><label for="iName3"><?= $this->getHtml('Name3'); ?></label>
                                     <tr><td><input type="text" id="iName3" name="name3" placeholder="&#xf040;">
-                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-client">
                                 </table>
                             </form>
                         </div>
diff --git a/Theme/Backend/client-list.tpl.php b/Theme/Backend/client-list.tpl.php
index 755a169..924c23c 100755
--- a/Theme/Backend/client-list.tpl.php
+++ b/Theme/Backend/client-list.tpl.php
@@ -107,7 +107,7 @@ echo $this->getData('nav')->render(); ?>
                  $image      = $value->getFileByType(0);
                  ?>
                 <tr data-href="<?= $url; ?>">
-                    <td><a href="<?= $url; ?>"><img width="30" loading="lazy" class="item-image"
+                    <td><a href="<?= $url; ?>"><img alt="<?= $this->getHtml('IMG_alt_client'); ?>" width="30" loading="lazy" class="item-image"
                             src="<?= $image instanceof NullMedia ?
                                         UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
                                         UriFactory::build('{/prefix}' . $image->getPath()); ?>"></a>
diff --git a/Theme/Backend/client-profile.tpl.php b/Theme/Backend/client-profile.tpl.php
index 43d9a85..1d5a9ba 100755
--- a/Theme/Backend/client-profile.tpl.php
+++ b/Theme/Backend/client-profile.tpl.php
@@ -73,7 +73,7 @@ echo $this->getData('nav')->render();
                                 </table>
                             </div>
                             <div class="portlet-foot">
-                                <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>"> <input type="submit" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
+                                <input type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>" name="save-client-profile"> <input type="submit" value="<?= $this->getHtml('Delete', '0', '0'); ?>" name="delete-client-profile">
                             </div>
                         </form>
                     </section>
@@ -132,14 +132,14 @@ echo $this->getData('nav')->render();
                                 <tr><td><label for="iName1"><?= $this->getHtml('City'); ?></label>
                                 <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($client->mainAddress->city); ?>" required>
                                 <tr><td><label for="iName1"><?= $this->getHtml('Country'); ?></label>
-                                <tr><td><select>
+                                <tr><td><select name="country">
                                     <?php foreach ($countryCodes as $code3 => $code2) : ?>
                                         <option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $client->mainAddress->getCountry() ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
                                     <?php endforeach; ?>
                                 </select>
                                 <tr><td>
                                     <?php if (\is_file(__DIR__ . '/../../../../phpOMS/Localization/Maps/svg/' . \strtolower($client->mainAddress->getCountry()) . '.svg')) : ?>
-                                    <img id="iMap" style="width: 100%;" src="<?= UriFactory::build('phpOMS/Localization/Maps/svg/' . \strtolower($client->mainAddress->getCountry()) . '.svg'); ?>">
+                                    <img alt="<?= $this->getHtml('IMG_alt_map'); ?>" id="iMap" style="width: 100%;" src="<?= UriFactory::build('phpOMS/Localization/Maps/svg/' . \strtolower($client->mainAddress->getCountry()) . '.svg'); ?>">
                                     <?php endif; ?>
                             </table>
                         </div>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 252a62f..d46fd31 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 // Modules/tests