diff --git a/Controller.php b/Controller.php
index 1f97075..90fea99 100644
--- a/Controller.php
+++ b/Controller.php
@@ -18,6 +18,8 @@ namespace Modules\ClientManagement;
 
 use Modules\Navigation\Models\Navigation;
 use Modules\Navigation\Views\NavigationView;
+use Modules\ClientManagement\Models\Client;
+use Modules\ClientManagement\Models\ClientMapper;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
@@ -97,6 +99,9 @@ class Controller extends ModuleAbstract implements WebInterface
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-list');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response));
 
+        $client = ClientMapper::getNewest(50);
+        $view->addData('client', $client);
+
         return $view;
     }
 
@@ -135,6 +140,9 @@ class Controller extends ModuleAbstract implements WebInterface
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-profile');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1003102001, $request, $response));
 
+        $client = ClientMapper::get((int) $request->getData('id'));
+        $view->setData('client', $client);
+
         return $view;
     }
 
diff --git a/Theme/Backend/clients-create.tpl.php b/Theme/Backend/clients-create.tpl.php
index 75df31d..0e62ab5 100644
--- a/Theme/Backend/clients-create.tpl.php
+++ b/Theme/Backend/clients-create.tpl.php
@@ -95,174 +95,198 @@ echo $this->getData('nav')->render(); ?>
         </div>
         <input type="radio" id="c-tab-3" name="tabular-2">
         <div class="tab">
-            <section class="box w-33 floatLeft">
-                <header><h1><?= $this->getText('Address') ?></h1></header>
-                <div class="inner">
-                    <form>
-                        <table class="layout w-100">
-                            <tr><td><label for="iAType"><?= $this->getText('Type'); ?></label>
-                            <tr><td><select id="iAType" name="atype">
-                                        <option><?= $this->getText('Default'); ?>
-                                        <option><?= $this->getText('Delivery'); ?>
-                                        <option><?= $this->getText('Invoice'); ?>
-                                    </select>
-                            <tr><td><label for="iAddress"><?= $this->getText('Address'); ?></label>
-                            <tr><td><input type="text" id="iAddress" name="address">
-                            <tr><td><label for="iZip"><?= $this->getText('Zip'); ?></label>
-                            <tr><td><input type="text" id="iZip" name="zip">
-                            <tr><td><label for="iCountry"><?= $this->getText('Country'); ?></label>
-                            <tr><td><input type="text" id="iCountry" name="country">
-                            <tr><td><label for="iAInfo"><?= $this->getText('Info'); ?></label>
-                            <tr><td><input type="text" id="iAInfo" name="ainfo">
-                            <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getText('IsDefault'); ?></label></span>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
-                        </table>
-                    </form>
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Address') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iAType"><?= $this->getText('Type'); ?></label>
+                                    <tr><td><select id="iAType" name="atype">
+                                                <option><?= $this->getText('Default'); ?>
+                                                <option><?= $this->getText('Delivery'); ?>
+                                                <option><?= $this->getText('Invoice'); ?>
+                                            </select>
+                                    <tr><td><label for="iAddress"><?= $this->getText('Address'); ?></label>
+                                    <tr><td><input type="text" id="iAddress" name="address">
+                                    <tr><td><label for="iZip"><?= $this->getText('Zip'); ?></label>
+                                    <tr><td><input type="text" id="iZip" name="zip">
+                                    <tr><td><label for="iCountry"><?= $this->getText('Country'); ?></label>
+                                    <tr><td><input type="text" id="iCountry" name="country">
+                                    <tr><td><label for="iAInfo"><?= $this->getText('Info'); ?></label>
+                                    <tr><td><input type="text" id="iAInfo" name="ainfo">
+                                    <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getText('IsDefault'); ?></label></span>
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
                 </div>
-            </section>
+            </div>
         </div>
         <input type="radio" id="c-tab-4" name="tabular-2">
         <div class="tab">
-            <section class="box w-33 floatLeft">
-                <header><h1><?= $this->getText('PaymentTerm') ?></h1></header>
-                <div class="inner">
-                    <form>
-                        <table class="layout w-100">
-                            <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
-                            <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
-                            <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
-                            <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
-                            <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><label for="iTerm"><?= $this->getText('Type') ?></label>
-                            <tr><td><select id="iTerm" name="term" required>
-                                        <option>
-                                    </select>
-                            <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->getText('Freightage') ?></label></span>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
-                        </table>
-                    </form>
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('PaymentTerm') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
+                                    <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
+                                    <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                                    <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
+                                    <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                                    <tr><td><input id="iGroup" name="group" type="text" placeholder="">
+                                    <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                                    <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
+                                    <tr><td><label for="iTerm"><?= $this->getText('Type') ?></label>
+                                    <tr><td><select id="iTerm" name="term" required>
+                                                <option>
+                                            </select>
+                                    <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->getText('Freightage') ?></label></span>
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
                 </div>
-            </section>
+            </div>
         </div>
         <input type="radio" id="c-tab-5" name="tabular-2">
         <div class="tab">
-            <section class="box w-33 floatLeft">
-                <header><h1><?= $this->getText('Payment') ?></h1></header>
-                <div class="inner">
-                    <form>
-                        <table class="layout w-100">
-                            <tr><td><label for="iACType"><?= $this->getText('Type'); ?></label>
-                            <tr><td><select id="iACType" name="actype">
-                                        <option><?= $this->getText('Wire'); ?>
-                                        <option><?= $this->getText('Creditcard'); ?>
-                                    </select>
-                            <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
-                        </table>
-                    </form>
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Payment') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iACType"><?= $this->getText('Type'); ?></label>
+                                    <tr><td><select id="iACType" name="actype">
+                                                <option><?= $this->getText('Wire'); ?>
+                                                <option><?= $this->getText('Creditcard'); ?>
+                                            </select>
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
                 </div>
-            </section>
+            </div>
         </div>
         <input type="radio" id="c-tab-6" name="tabular-2">
         <div class="tab">
-            <section class="box w-33 floatLeft">
-                <header><h1><?= $this->getText('Price') ?></h1></header>
-                <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
-                        <table class="layout wf-100">
-                            <tbody>
-                            <tr><td colspan="2"><label for="iPType"><?= $this->getText('Type') ?></label>
-                            <tr><td><select id="iPType" name="ptye">
-                                        <option>
-                                    </select><td>
-                            <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
-                            <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
-                            <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
-                            <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
-                            <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><label for="iPQuantity"><?= $this->getText('Quantity') ?></label>
-                            <tr><td><input id="iPQuantity" name="quantity" type="text" placeholder=""><td>
-                            <tr><td><label for="iPrice"><?= $this->getText('Price') ?></label>
-                            <tr><td><input id="iPrice" name="price" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><label for="iDiscount"><?= $this->getText('Discount') ?></label>
-                            <tr><td><input id="iDiscount" name="discount" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><label for="iDiscount"><?= $this->getText('DiscountP') ?></label>
-                            <tr><td><input id="iDiscountP" name="discountp" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><label for="iBonus"><?= $this->getText('Bonus') ?></label>
-                            <tr><td><input id="iBonus" name="bonus" type="number" step="any" min="0" placeholder=""><td>
-                            <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
-                        </table>
-                    </form>
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Price') ?></h1></header>
+                        <div class="inner">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
+                                <table class="layout wf-100">
+                                    <tbody>
+                                    <tr><td colspan="2"><label for="iPType"><?= $this->getText('Type') ?></label>
+                                    <tr><td><select id="iPType" name="ptye">
+                                                <option>
+                                            </select><td>
+                                    <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
+                                    <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
+                                    <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                                    <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
+                                    <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                                    <tr><td><input id="iGroup" name="group" type="text" placeholder="">
+                                    <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                                    <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
+                                    <tr><td><label for="iPQuantity"><?= $this->getText('Quantity') ?></label>
+                                    <tr><td><input id="iPQuantity" name="quantity" type="text" placeholder=""><td>
+                                    <tr><td><label for="iPrice"><?= $this->getText('Price') ?></label>
+                                    <tr><td><input id="iPrice" name="price" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><label for="iDiscount"><?= $this->getText('Discount') ?></label>
+                                    <tr><td><input id="iDiscount" name="discount" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><label for="iDiscount"><?= $this->getText('DiscountP') ?></label>
+                                    <tr><td><input id="iDiscountP" name="discountp" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><label for="iBonus"><?= $this->getText('Bonus') ?></label>
+                                    <tr><td><input id="iBonus" name="bonus" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
                 </div>
-            </section>
+            </div>
         </div>
         <input type="radio" id="c-tab-7" name="tabular-2">
         <div class="tab">
-            <section class="box w-33 floatLeft">
-                <header><h1><?= $this->getText('AreaManager') ?></h1></header>
-                <div class="inner">
-                    <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
-                        <table class="layout wf-100">
-                            <tbody>
-                            <tr><td><label for="iManager"><?= $this->getText('AreaManager') ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iManager" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
-                            <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
-                            <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
-                            <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
-                            <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
-                            <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
-                            <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
-                            <tr><td><input id="iGroup" name="group" type="text" placeholder="">
-                            <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
-                            <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
-                            <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
-                        </table>
-                    </form>
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('AreaManager') ?></h1></header>
+                        <div class="inner">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
+                                <table class="layout wf-100">
+                                    <tbody>
+                                    <tr><td><label for="iManager"><?= $this->getText('AreaManager') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iManager" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
+                                    <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
+                                    <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                                    <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
+                                    <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                                    <tr><td><input id="iGroup" name="group" type="text" placeholder="">
+                                    <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                                    <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
+                                    <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
                 </div>
-            </section>
+            </div>
         </div>
         <input type="radio" id="c-tab-8" name="tabular-2">
         <div class="tab">
         </div>
         <input type="radio" id="c-tab-9" name="tabular-2">
         <div class="tab">
+            <div class="row">
+                <div class="col-xs-12">
             <?php
             $footerView = new \Web\Views\Lists\PaginationView($this->app, $this->request, $this->response);
             $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
             $footerView->setPages(20);
             $footerView->setPage(1);
             ?>
-            <div class="box w-100">
-                <table class="table">
-                    <caption><?= $this->getText('Logs') ?></caption>
-                    <thead>
-                    <tr>
-                        <td>IP
-                        <td><?= $this->getText('ID', 0, 0); ?>
-                        <td><?= $this->getText('Name'); ?>
-                        <td class="wf-100"><?= $this->getText('Log'); ?>
-                        <td><?= $this->getText('Date'); ?>
-                    <tfoot>
-                    <tr>
-                        <td colspan="6"><?= $footerView->render(); ?>
-                    <tbody>
-                    <tr>
-                        <td><?= $this->request->getOrigin(); ?>
-                        <td><?= $this->request->getAccount(); ?>
-                        <td><?= $this->request->getAccount(); ?>
-                        <td>Creating customer
-                        <td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
-                </table>
+                    <div class="box wf-100">
+                        <table class="table">
+                            <caption><?= $this->getText('Logs') ?></caption>
+                            <thead>
+                            <tr>
+                                <td>IP
+                                <td><?= $this->getText('ID', 0, 0); ?>
+                                <td><?= $this->getText('Name'); ?>
+                                <td class="wf-100"><?= $this->getText('Log'); ?>
+                                <td><?= $this->getText('Date'); ?>
+                            <tfoot>
+                            <tr>
+                                <td colspan="6"><?= $footerView->render(); ?>
+                            <tbody>
+                            <tr>
+                                <td><?= $this->request->getOrigin(); ?>
+                                <td><?= $this->request->getAccount(); ?>
+                                <td><?= $this->request->getAccount(); ?>
+                                <td>Creating customer
+                                <td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
+                        </table>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php
index ddc9d1b..5d87a07 100644
--- a/Theme/Backend/clients-list.tpl.php
+++ b/Theme/Backend/clients-list.tpl.php
@@ -19,6 +19,8 @@ $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
 $footerView->setPages(20);
 $footerView->setPage(1);
 
+$clients = $this->getData('client');
+
 echo $this->getData('nav')->render(); ?>
 
 <!-- Hover may be better here?!?!?!
@@ -78,7 +80,17 @@ echo $this->getData('nav')->render(); ?>
                 <tr>
                     <td colspan="8"><?= $footerView->render(); ?>
                 <tbody>
-                <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
+                <?php $count = 0; foreach($clients as $key => $value) : $count++; 
+                 $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/sales/client/profile?{?}&id=' . $value->getId()); ?>
+                <tr>
+                    <td><a href="<?= $url; ?>"><?= $value->getNumber(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getProfile()->getAccount()->getName1(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getProfile()->getAccount()->getName2(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getProfile()->getAccount()->getName3(); ?></a>
+                    <td>
+                    <td>
+                    <td>
+                    <td>
                 <?php endforeach; ?>
                 <?php if($count === 0) : ?>
                 <tr><td colspan="8" class="empty"><?= $this->getText('Empty', 0, 0); ?>
diff --git a/Theme/Backend/clients-profile.tpl.php b/Theme/Backend/clients-profile.tpl.php
new file mode 100644
index 0000000..79b3964
--- /dev/null
+++ b/Theme/Backend/clients-profile.tpl.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.1
+ *
+ * @category   TBD
+ * @package    TBD
+ * @author     OMS Development Team <dev@oms.com>
+ * @author     Dennis Eichhorn <d.eichhorn@oms.com>
+ * @copyright  Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://orange-management.com
+ */
+
+$client = $this->getData('client');
+
+/**
+ * @var \phpOMS\Views\View $this
+ */
+echo $this->getData('nav')->render(); 
+?>
+<div class="tabular-2">
+    <div class="box">
+        <ul class="tab-links">
+            <li><label for="c-tab-1"><?= $this->getText('Master') ?></label></li>
+            <li><label for="c-tab-2"><?= $this->getText('Contact') ?></label></li>
+            <li><label for="c-tab-3"><?= $this->getText('Addresses') ?></label></li>
+            <li><label for="c-tab-4"><?= $this->getText('PaymentTerm') ?></label></li>
+            <li><label for="c-tab-5"><?= $this->getText('Payment') ?></label></li>
+            <li><label for="c-tab-6"><?= $this->getText('Prices') ?></label></li>
+            <li><label for="c-tab-7"><?= $this->getText('AreaManager') ?></label></li>
+            <li><label for="c-tab-8"><?= $this->getText('Files') ?></label></li>
+            <li><label for="c-tab-9"><?= $this->getText('Logs') ?></label>
+        </ul>
+    </div>
+    <div class="tab-content">
+        <input type="radio" id="c-tab-1" name="tabular-2" checked>
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Client') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iId"><?= $this->getText('ID', 0, 0); ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="number" id="iId" min="1" name="id" value="<?= $client->getNumber(); ?>" disabled></span>
+                                    <tr><td><label for="iName1"><?= $this->getText('Name1'); ?></label>
+                                    <tr><td><input type="text" id="iName1" name="name1" placeholder="&#xf040;" value="<?= $client->getProfile()->getAccount()->getName1(); ?>" required>
+                                    <tr><td><label for="iName2"><?= $this->getText('Name2'); ?></label>
+                                    <tr><td><input type="text" id="iName2" name="name2" value="<?= $client->getProfile()->getAccount()->getName2(); ?>" placeholder="&#xf040;">
+                                    <tr><td><label for="iName3"><?= $this->getText('Name3'); ?></label>
+                                    <tr><td><input type="text" id="iName3" name="name3" value="<?= $client->getProfile()->getAccount()->getName3(); ?>" placeholder="&#xf040;">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Save', 0, 0); ?>"> <input type="submit" value="<?= $this->getText('Delete', 0, 0); ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-2" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Contact') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iCType"><?= $this->getText('Type'); ?></label>
+                                    <tr><td><select id="iCType" name="actype">
+                                                <option><?= $this->getText('Email'); ?>
+                                                <option><?= $this->getText('Fax'); ?>
+                                                <option><?= $this->getText('Phone'); ?>
+                                            </select>
+                                    <tr><td><label for="iCStype"><?= $this->getText('Subtype'); ?></label>
+                                    <tr><td><select id="iCStype" name="acstype">
+                                                <option><?= $this->getText('Office'); ?>
+                                                <option><?= $this->getText('Sales'); ?>
+                                                <option><?= $this->getText('Purchase'); ?>
+                                                <option><?= $this->getText('Accounting'); ?>
+                                                <option><?= $this->getText('Support'); ?>
+                                            </select>
+                                    <tr><td><label for="iCInfo"><?= $this->getText('Info'); ?></label>
+                                    <tr><td><input type="text" id="iCInfo" name="cinfo">
+                                    <tr><td><label for="iCData"><?= $this->getText('Contact'); ?></label>
+                                    <tr><td><input type="text" id="iCData" name="cdata">
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-3" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Address') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iAType"><?= $this->getText('Type'); ?></label>
+                                    <tr><td><select id="iAType" name="atype">
+                                                <option><?= $this->getText('Default'); ?>
+                                                <option><?= $this->getText('Delivery'); ?>
+                                                <option><?= $this->getText('Invoice'); ?>
+                                            </select>
+                                    <tr><td><label for="iAddress"><?= $this->getText('Address'); ?></label>
+                                    <tr><td><input type="text" id="iAddress" name="address">
+                                    <tr><td><label for="iZip"><?= $this->getText('Zip'); ?></label>
+                                    <tr><td><input type="text" id="iZip" name="zip">
+                                    <tr><td><label for="iCountry"><?= $this->getText('Country'); ?></label>
+                                    <tr><td><input type="text" id="iCountry" name="country">
+                                    <tr><td><label for="iAInfo"><?= $this->getText('Info'); ?></label>
+                                    <tr><td><input type="text" id="iAInfo" name="ainfo">
+                                    <tr><td><span class="check"><input type="checkbox" id="iDefault" name="default" checked><label for="iDefault"><?= $this->getText('IsDefault'); ?></label></span>
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-4" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('PaymentTerm') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
+                                    <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
+                                    <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                                    <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
+                                    <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                                    <tr><td><input id="iGroup" name="group" type="text" placeholder="">
+                                    <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                                    <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
+                                    <tr><td><label for="iTerm"><?= $this->getText('Type') ?></label>
+                                    <tr><td><select id="iTerm" name="term" required>
+                                                <option>
+                                            </select>
+                                    <tr><td><span class="check"><input type="checkbox" id="iFreightage" name="freightage"><label for="iFreightage"><?= $this->getText('Freightage') ?></label></span>
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-5" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Payment') ?></h1></header>
+                        <div class="inner">
+                            <form>
+                                <table class="layout w-100">
+                                    <tr><td><label for="iACType"><?= $this->getText('Type'); ?></label>
+                                    <tr><td><select id="iACType" name="actype">
+                                                <option><?= $this->getText('Wire'); ?>
+                                                <option><?= $this->getText('Creditcard'); ?>
+                                            </select>
+                                    <tr><td colspan="2"><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-6" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('Price') ?></h1></header>
+                        <div class="inner">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
+                                <table class="layout wf-100">
+                                    <tbody>
+                                    <tr><td colspan="2"><label for="iPType"><?= $this->getText('Type') ?></label>
+                                    <tr><td><select id="iPType" name="ptye">
+                                                <option>
+                                            </select><td>
+                                    <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
+                                    <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
+                                    <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                                    <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
+                                    <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                                    <tr><td><input id="iGroup" name="group" type="text" placeholder="">
+                                    <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                                    <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
+                                    <tr><td><label for="iPQuantity"><?= $this->getText('Quantity') ?></label>
+                                    <tr><td><input id="iPQuantity" name="quantity" type="text" placeholder=""><td>
+                                    <tr><td><label for="iPrice"><?= $this->getText('Price') ?></label>
+                                    <tr><td><input id="iPrice" name="price" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><label for="iDiscount"><?= $this->getText('Discount') ?></label>
+                                    <tr><td><input id="iDiscount" name="discount" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><label for="iDiscount"><?= $this->getText('DiscountP') ?></label>
+                                    <tr><td><input id="iDiscountP" name="discountp" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><label for="iBonus"><?= $this->getText('Bonus') ?></label>
+                                    <tr><td><input id="iBonus" name="bonus" type="number" step="any" min="0" placeholder=""><td>
+                                    <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-7" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12 col-md-6 col-lg-4">
+                    <section class="box wf-100">
+                        <header><h1><?= $this->getText('AreaManager') ?></h1></header>
+                        <div class="inner">
+                            <form action="<?= \phpOMS\Uri\UriFactory::build('/{/lang}/api/...'); ?>" method="post">
+                                <table class="layout wf-100">
+                                    <tbody>
+                                    <tr><td><label for="iManager"><?= $this->getText('AreaManager') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iManager" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSource"><?= $this->getText('ID') ?></label>
+                                    <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input id="iSource" name="source" type="text" placeholder=""></span>
+                                    <tr><td><label for="iSegment"><?= $this->getText('Segment') ?></label>
+                                    <tr><td><input id="iSegment" name="segment" type="text" placeholder="">
+                                    <tr><td><label for="iProductgroup"><?= $this->getText('Productgroup') ?></label>
+                                    <tr><td><input id="iProductgroup" name="productgroup" type="text" placeholder="">
+                                    <tr><td><label for="iGroup"><?= $this->getText('Group') ?></label>
+                                    <tr><td><input id="iGroup" name="group" type="text" placeholder="">
+                                    <tr><td><label for="iArticlegroup"><?= $this->getText('Articlegroup') ?></label>
+                                    <tr><td><input id="iArticlegroup" name="articlegroup" type="text" placeholder="">
+                                    <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0) ?>">
+                                </table>
+                            </form>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+        <input type="radio" id="c-tab-8" name="tabular-2">
+        <div class="tab">
+        </div>
+        <input type="radio" id="c-tab-9" name="tabular-2">
+        <div class="tab">
+            <div class="row">
+                <div class="col-xs-12">
+            <?php
+            $footerView = new \Web\Views\Lists\PaginationView($this->app, $this->request, $this->response);
+            $footerView->setTemplate('/Web/Templates/Lists/Footer/PaginationBig');
+            $footerView->setPages(20);
+            $footerView->setPage(1);
+            ?>
+                    <div class="box wf-100">
+                        <table class="table">
+                            <caption><?= $this->getText('Logs') ?></caption>
+                            <thead>
+                            <tr>
+                                <td>IP
+                                <td><?= $this->getText('ID', 0, 0); ?>
+                                <td><?= $this->getText('Name'); ?>
+                                <td class="wf-100"><?= $this->getText('Log'); ?>
+                                <td><?= $this->getText('Date'); ?>
+                            <tfoot>
+                            <tr>
+                                <td colspan="6"><?= $footerView->render(); ?>
+                            <tbody>
+                            <tr>
+                                <td><?= $this->request->getOrigin(); ?>
+                                <td><?= $this->request->getAccount(); ?>
+                                <td><?= $this->request->getAccount(); ?>
+                                <td>Creating customer
+                                <td><?= (new \DateTime('now'))->format('Y-m-d H:i:s') ?>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/Theme/Backend/clients-single.tpl.php b/Theme/Backend/clients-single.tpl.php
deleted file mode 100644
index 9e3f926..0000000
--- a/Theme/Backend/clients-single.tpl.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.1
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-/**
- * @var \phpOMS\Views\View $this
- */
-echo $this->getData('nav')->render(); ?>