diff --git a/Controller.js b/Controller.js
index 1fa8e50..d020d8b 100755
--- a/Controller.js
+++ b/Controller.js
@@ -53,7 +53,7 @@ jsOMS.Modules.ClientManagement = class {
     bindMap (map)
     {
         if (typeof map === 'undefined' || !map) {
-            jsOMS.Log.Logger.instance.error('Invalid map: ' + map, 'ClientManager');
+            jsOMS.Log.Logger.instance.error('Invalid map: ' + map, 'ClientManagement');
 
             return;
         }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 359f1a1..b1afeda 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -202,7 +202,7 @@ final class BackendController extends Controller
      */
     public function viewClientManagementClientProfile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
-        $head = $response->get('Content')->head;
+        $head = $response->data['Content']->head;
         $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
         $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js');
         $head->addAsset(AssetType::JSLATE, 'Resources/OpenLayers/OpenLayers.js');
@@ -320,7 +320,7 @@ final class BackendController extends Controller
      */
     public function viewClientAnalysis(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
     {
-        $head = $response->get('Content')->head;
+        $head = $response->data['Content']->head;
         $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
         $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js');
         $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['type' => 'module']);
diff --git a/Theme/Backend/client-list.tpl.php b/Theme/Backend/client-list.tpl.php
index de9d982..18fe035 100755
--- a/Theme/Backend/client-list.tpl.php
+++ b/Theme/Backend/client-list.tpl.php
@@ -101,9 +101,8 @@ echo $this->data['nav']->render(); ?>
                         </label>
                 <tbody>
                 <?php $count = 0; foreach ($clients as $key => $value) : ++$count;
-                 $url        = UriFactory::build('{/base}/sales/client/profile?{?}&id=' . $value->id);
-                 $image      = $value->getFileByTypeName('client_profile_image');
-                 ?>
+                $url        = UriFactory::build('{/base}/sales/client/profile?{?}&id=' . $value->id);
+                ?>
                 <tr data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->number); ?></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
diff --git a/Theme/Backend/client-profile-bills.tpl.php b/Theme/Backend/client-profile-bills.tpl.php
index b60d608..e6d1dd9 100755
--- a/Theme/Backend/client-profile-bills.tpl.php
+++ b/Theme/Backend/client-profile-bills.tpl.php
@@ -181,8 +181,8 @@ $bills = $this->data['newestInvoices'] ?? [];
                         <td><a href="<?= $url; ?>"><?= $value->billZip; ?></a>
                         <td><a href="<?= $url; ?>"><?= $value->billCity; ?></a>
                         <td><a href="<?= $url; ?>"><?= $value->billCountry; ?></a>
-                        <td><a href="<?= $url; ?>"><?= $value->netSales->getCurrency(); ?></a>
-                        <td><a href="<?= $url; ?>"><?= $value->netProfit->getCurrency(); ?></a>
+                        <td><a href="<?= $url; ?>"><?= $this->getCurrency($value->netSales); ?></a>
+                        <td><a href="<?= $url; ?>"><?= $this->getCurrency($value->netProfit); ?></a>
                         <td><a href="<?= $url; ?>"><?= $value->createdAt->format('Y-m-d'); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
diff --git a/Theme/Backend/client-profile-items.tpl.php b/Theme/Backend/client-profile-items.tpl.php
index 7aa5473..f30e1ca 100755
--- a/Theme/Backend/client-profile-items.tpl.php
+++ b/Theme/Backend/client-profile-items.tpl.php
@@ -145,11 +145,11 @@ $items = $this->data['items'] ?? [];
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->itemNumber); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->itemName); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml((string) $value->getQuantity()); ?></a>
-                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->singleSalesPriceNet->getCurrency()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->getcurrency($value->singleSalesPriceNet); ?></a>
                     <td>
                     <td>
                     <td>
-                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->totalSalesPriceNet->getCurrency()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->getcurrency($value->totalSalesPriceNet); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
                     <tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/client-profile.tpl.php b/Theme/Backend/client-profile.tpl.php
index 1350f8e..0a22b29 100755
--- a/Theme/Backend/client-profile.tpl.php
+++ b/Theme/Backend/client-profile.tpl.php
@@ -43,7 +43,7 @@ echo $this->data['nav']->render();
             <li><label for="c-tab-3"><?= $this->getHtml('Addresses'); ?></label></li>
             <li><label for="c-tab-5"><?= $this->getHtml('Payment'); ?></label></li>
             <li><label for="c-tab-6"><?= $this->getHtml('Prices'); ?></label></li>
-            <li><label for="c-tab-7"><?= $this->getHtml('Attributes'); ?></label></li>
+            <li><label for="c-tab-7"><?= $this->getHtml('Attributes', 'Attribute', 'Backend'); ?></label></li>
             <li><label for="c-tab-8"><?= $this->getHtml('Files'); ?></label></li>
             <li><label for="c-tab-9"><?= $this->getHtml('Invoices'); ?></label>
             <li><label for="c-tab-10"><?= $this->getHtml('Articles'); ?></label>
@@ -93,7 +93,7 @@ echo $this->data['nav']->render();
                     <section class="portlet">
                         <div class="portlet-head">
                             <?= $this->getHtml('Contact'); ?>
-                            <a class="floatRight" href=""><i class="fa fa-envelope-o btn"></i></a>
+                            <a class="end-xs" href=""><i class="fa fa-envelope-o btn"></i></a>
                         </div>
                         <div class="portlet-body">
                             <table class="layout wf-100">
@@ -110,7 +110,7 @@ echo $this->data['nav']->render();
                     <section class="portlet map-small">
                         <div class="portlet-head">
                             <?= $this->getHtml('Address'); ?>
-                            <span class="clickPopup floatRight">
+                            <span class="clickPopup end-xs">
                                 <label for="addressDropdown"><i class="fa fa-print btn"></i></label>
                                 <input id="addressDropdown" name="addressDropdown" type="checkbox">
                                 <div class="popup">