diff --git a/Interfaces/OMS/Importer.php b/Interfaces/OMS/Importer.php
index 3b4bcb5..80837f3 100755
--- a/Interfaces/OMS/Importer.php
+++ b/Interfaces/OMS/Importer.php
@@ -199,7 +199,11 @@ final class Importer extends ImporterAbstract
 
                         foreach ($keys as $key => $values) {
                             \fwrite($fp,
-                                "    '" . $key . "'" . \str_repeat(' ', $keyLengths[$module][$theme][$file] - \strlen($key)) . " => '" . \str_replace(['\'', '\\'], ['\\\'', '\\\\'], $values[$language] ?? '') . "',\n"
+                                "    '" . $key . "'"
+                                . \str_repeat(' ', $keyLengths[$module][$theme][$file] - \strlen($key))
+                                . " => '"
+                                . \str_replace(['\'', '\\'], ['\\\'', '\\\\'], $values[$language] ?? '')
+                                . "',\n"
                             );
                         }
 
diff --git a/Theme/Backend/exchange-export-list.tpl.php b/Theme/Backend/exchange-export-list.tpl.php
index 0098fea..738e129 100755
--- a/Theme/Backend/exchange-export-list.tpl.php
+++ b/Theme/Backend/exchange-export-list.tpl.php
@@ -21,10 +21,21 @@ echo $this->getData('nav')->render();
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Exports'); ?><i class="fa fa-download floatRight download btn"></i></div>
-            <table class="default">
+            <table id="exportList" class="default">
                 <thead>
                 <tr>
                     <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                        <label for="exportList-sort-1">
+                            <input type="radio" name="exportList-sort" id="exportList-sort-1">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exportList-sort-2">
+                            <input type="radio" name="exportList-sort" id="exportList-sort-2">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                 <tbody>
                 <?php $count = 0; foreach ($interfaces as $key => $value) : ++$count;
                 $url         = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/export/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/exchange-import-list.tpl.php b/Theme/Backend/exchange-import-list.tpl.php
index 2fae6ab..d82a93c 100755
--- a/Theme/Backend/exchange-import-list.tpl.php
+++ b/Theme/Backend/exchange-import-list.tpl.php
@@ -21,10 +21,21 @@ echo $this->getData('nav')->render();
     <div class="col-xs-12">
         <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Imports'); ?><i class="fa fa-download floatRight download btn"></i></div>
-            <table class="default">
+            <table id="importList" class="default">
                 <thead>
                 <tr>
                     <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                        <label for="importList-sort-1">
+                            <input type="radio" name="importList-sort" id="importList-sort-1">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="importList-sort-2">
+                            <input type="radio" name="importList-sort" id="importList-sort-2">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                 <tbody>
                 <?php $count = 0; foreach ($interfaces as $key => $value) : ++$count;
                 $url         = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/import/profile?{?}&id=' . $value->getId()); ?>
diff --git a/Theme/Backend/exchange-log-list.tpl.php b/Theme/Backend/exchange-log-list.tpl.php
index b97c951..ac955f7 100755
--- a/Theme/Backend/exchange-log-list.tpl.php
+++ b/Theme/Backend/exchange-log-list.tpl.php
@@ -27,11 +27,77 @@ echo $this->getData('nav')->render(); ?>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
+                        <label for="exchangeLogs-sort-1">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-1">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exchangeLogs-sort-2">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-2">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                     <td><?= $this->getHtml('Type'); ?>
+                        <label for="exchangeLogs-sort-3">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-3">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exchangeLogs-sort-4">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-4">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                     <td><?= $this->getHtml('Subtype'); ?>
+                        <label for="exchangeLogs-sort-5">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-5">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exchangeLogs-sort-6">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-6">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                     <td class="wf-100"><?= $this->getHtml('Exchange'); ?>
+                        <label for="exchangeLogs-sort-7">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-7">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exchangeLogs-sort-8">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-8">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                     <td><?= $this->getHtml('CreatedBy'); ?>
+                        <label for="exchangeLogs-sort-9">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-9">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exchangeLogs-sort-0">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-0">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                     <td><?= $this->getHtml('CreatedAt'); ?>
+                        <label for="exchangeLogs-sort-11">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-11">
+                            <i class="sort-asc fa fa-chevron-up"></i>
+                        </label>
+                        <label for="exchangeLogs-sort-12">
+                            <input type="radio" name="exchangeLogs-sort" id="exchangeLogs-sort-12">
+                             <i class="sort-desc fa fa-chevron-down"></i>
+                        </label>
+                        <label>
+                            <i class="filter fa fa-filter"></i>
+                        </label>
                 <tbody>
                 <?php $count = 0; foreach ($logs as $key => $value) :
                     ++$count;