diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 8f31377bd..500bf6037 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -208,6 +208,7 @@
                       
                           <ul class="nav nav-tabs">
                             <li class="nav-item"><a class="nav-link active" href="#order-detail-<?=$order->id?>-journal" data-toggle="tab" aria-expanded="false">Journal</a></li>
+                            <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-contact" data-toggle="tab" aria-expanded="false">Kontakt</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-details" data-toggle="tab" aria-expanded="false">Details</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-files" data-toggle="tab" aria-expanded="false">Dokumente</a></li>
                           </ul>
@@ -255,6 +256,107 @@
                           </div>
                         </div>
 
+                        
+                        <div id="order-detail-<?=$order->id?>-contact" class="tab-pane">
+                          <div class="row justify-content-center">
+                            <div class="col-xl-8 col-lg-12">
+
+                              <div class="card">
+
+                                <div class="card-body">
+                                  <div class="card-header bg-info text-white pl-2 pr-2 pt-1 pb-1">Kontaktdaten</div>
+                                  
+                                  <div class="row">
+                                    <div class="col-lg-6">
+                                      <h4>Vertragsinhaber</h4>
+                                      <table class="table table-sm table-striped table-bordered">
+                                        <tr>
+                                          <th>Firma</th>
+                                          <td><?=$order->owner->company?></td>
+                                        </tr><tr>
+                                          <th>Vorname</th>
+                                          <td><?=$order->owner->firstname?></td>
+                                        </tr><tr>
+                                          <th>Nachname</th>
+                                          <td><?=$order->owner->lastname?></td>
+                                        </tr><tr>
+                                          <th>Straße</th>
+                                          <td><?=$order->owner->street?></td>
+                                        </tr><tr>
+                                          <th>PLZ</th>
+                                          <td><?=$order->owner->zip?></td>
+                                        </tr><tr>
+                                          <th>Ort</th>
+                                          <td><?=$order->owner->city?></td>
+                                        </tr><tr>
+                                          <th>Land</th>
+                                          <td><?=$order->owner->country?></td>
+                                        </tr><tr>
+                                          <th>Telefon</th>
+                                          <td class="text-monospace"><?=$order->owner->phone?></td>
+                                        </tr><tr>
+                                          <th>Mobiltelefon</th>
+                                          <td class="text-monospace"><?=$order->owner->mobile?></td>
+                                        </tr><tr>
+                                          <th>Fax</th>
+                                          <td class="text-monospace"><?=$order->owner->fax?></td>
+                                        </tr><tr>
+                                          <th>Email</th>
+                                          <td class="text-monospace"><?=$order->owner->email?></td>
+                                        </tr>
+                                      </table>
+                                    </div>
+                                    
+                                    <?php if($order->billingaddress_id): ?>
+                                    <div class="col-lg-6">
+                                      <h4>Rechungsempfänger</h4>
+                                      <table class="table table-sm table-striped table-bordered">
+                                        <tr>
+                                          <th>Firma</th>
+                                          <td><?=$order->billingaddress->company?></td>
+                                        </tr><tr>
+                                          <th>Vorname</th>
+                                          <td><?=$order->billingaddress->firstname?></td>
+                                        </tr><tr>
+                                          <th>Nachname</th>
+                                          <td><?=$order->billingaddress->lastname?></td>
+                                        </tr><tr>
+                                          <th>Straße</th>
+                                          <td><?=$order->billingaddress->street?></td>
+                                        </tr><tr>
+                                          <th>PLZ</th>
+                                          <td><?=$order->billingaddress->zip?></td>
+                                        </tr><tr>
+                                          <th>Ort</th>
+                                          <td><?=$order->billingaddress->city?></td>
+                                        </tr><tr>
+                                          <th>Land</th>
+                                          <td><?=$order->billingaddress->country?></td>
+                                        </tr><tr>
+                                          <th>Telefon</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->phone?></td>
+                                        </tr><tr>
+                                          <th>Mobiltelefon</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->mobile?></td>
+                                        </tr><tr>
+                                          <th>Fax</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->fax?></td>
+                                        </tr><tr>
+                                          <th>Email</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->email?></td>
+                                        </tr>
+                                      </table>
+                                    </div>
+                                    <?php endif; ?>
+                                  </div>
+                                  
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        
+                        
                         <div id="order-detail-<?=$order->id?>-details" class="tab-pane">
                           <div class="row justify-content-center">
                             <div class="col-xl-8 col-lg-12">
@@ -294,7 +396,7 @@
 
                                   <?php if(is_array($order->products) && count($order->products)): ?>
                                   <h4>Produkte</h4>
-                                  <table class="table table-sm table-striped">
+                                  <table class="table table-sm table-striped table-bordered">
                                     <tr>
                                       <th class="text-right">Pos</th>
                                       <th class="text-right">Anzahl</th>
@@ -542,6 +644,7 @@
                       
                           <ul class="nav nav-tabs">
                             <li class="nav-item"><a class="nav-link active" href="#order-detail-<?=$order->id?>-journal" data-toggle="tab" aria-expanded="false">Journal</a></li>
+                            <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-contact" data-toggle="tab" aria-expanded="false">Kontakt</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-details" data-toggle="tab" aria-expanded="false">Details</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-files" data-toggle="tab" aria-expanded="false">Dokumente</a></li>
                           </ul>
@@ -588,6 +691,107 @@
                             </div>
                           </div>
                         </div>
+                        
+                        
+                        <div id="order-detail-<?=$order->id?>-contact" class="tab-pane">
+                          <div class="row justify-content-center">
+                            <div class="col-xl-8 col-lg-12">
+
+                              <div class="card">
+
+                                <div class="card-body">
+                                  <div class="card-header bg-info text-white pl-2 pr-2 pt-1 pb-1">Kontaktdaten</div>
+                                  
+                                  <div class="row">
+                                    <div class="col-lg-6">
+                                      <h4>Vertragsinhaber</h4>
+                                      <table class="table table-sm table-striped table-bordered">
+                                        <tr>
+                                          <th>Firma</th>
+                                          <td><?=$order->owner->company?></td>
+                                        </tr><tr>
+                                          <th>Vorname</th>
+                                          <td><?=$order->owner->firstname?></td>
+                                        </tr><tr>
+                                          <th>Nachname</th>
+                                          <td><?=$order->owner->lastname?></td>
+                                        </tr><tr>
+                                          <th>Straße</th>
+                                          <td><?=$order->owner->street?></td>
+                                        </tr><tr>
+                                          <th>PLZ</th>
+                                          <td><?=$order->owner->zip?></td>
+                                        </tr><tr>
+                                          <th>Ort</th>
+                                          <td><?=$order->owner->city?></td>
+                                        </tr><tr>
+                                          <th>Land</th>
+                                          <td><?=$order->owner->country?></td>
+                                        </tr><tr>
+                                          <th>Telefon</th>
+                                          <td class="text-monospace"><?=$order->owner->phone?></td>
+                                        </tr><tr>
+                                          <th>Mobiltelefon</th>
+                                          <td class="text-monospace"><?=$order->owner->mobile?></td>
+                                        </tr><tr>
+                                          <th>Fax</th>
+                                          <td class="text-monospace"><?=$order->owner->fax?></td>
+                                        </tr><tr>
+                                          <th>Email</th>
+                                          <td class="text-monospace"><?=$order->owner->email?></td>
+                                        </tr>
+                                      </table>
+                                    </div>
+                                    
+                                    <?php if($order->billingaddress_id): ?>
+                                    <div class="col-lg-6">
+                                      <h4>Rechungsempfänger</h4>
+                                      <table class="table table-sm table-striped table-bordered">
+                                        <tr>
+                                          <th>Firma</th>
+                                          <td><?=$order->billingaddress->company?></td>
+                                        </tr><tr>
+                                          <th>Vorname</th>
+                                          <td><?=$order->billingaddress->firstname?></td>
+                                        </tr><tr>
+                                          <th>Nachname</th>
+                                          <td><?=$order->billingaddress->lastname?></td>
+                                        </tr><tr>
+                                          <th>Straße</th>
+                                          <td><?=$order->billingaddress->street?></td>
+                                        </tr><tr>
+                                          <th>PLZ</th>
+                                          <td><?=$order->billingaddress->zip?></td>
+                                        </tr><tr>
+                                          <th>Ort</th>
+                                          <td><?=$order->billingaddress->city?></td>
+                                        </tr><tr>
+                                          <th>Land</th>
+                                          <td><?=$order->billingaddress->country?></td>
+                                        </tr><tr>
+                                          <th>Telefon</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->phone?></td>
+                                        </tr><tr>
+                                          <th>Mobiltelefon</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->mobile?></td>
+                                        </tr><tr>
+                                          <th>Fax</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->fax?></td>
+                                        </tr><tr>
+                                          <th>Email</th>
+                                          <td class="text-monospace"><?=$order->billingaddress->email?></td>
+                                        </tr>
+                                      </table>
+                                    </div>
+                                    <?php endif; ?>
+                                  </div>
+                                  
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        
 
                         <div id="order-detail-<?=$order->id?>-details" class="tab-pane">
                           <div class="row justify-content-center">
@@ -627,7 +831,7 @@
 
                                   <?php if(is_array($order->products) && count($order->products)): ?>
                                   <h4>Produkte</h4>
-                                  <table class="table table-sm table-striped">
+                                  <table class="table table-sm table-striped table-bordered">
                                     <tr>
                                       <th class="text-right">Pos</th>
                                       <th class="text-right">Anzahl</th>
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 666a727e5..9eff74e00 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -373,14 +373,14 @@ td.controls {
   background-color: #f0fff0;
 }
 
-.top-no-border td,
-.top-no-border th {
+.top-no-border > td,
+.top-no-border > th {
   border-top: none;
   padding-top: 2px;
 }
 
-.bottom-no-border td,
-.bottom-no-border th {
+.bottom-no-border > td,
+.bottom-no-border > th {
   border-bottom: none;
   padding-bottom: 2px;
 }