diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index aea8b3f32..fdac973f7 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -195,40 +195,133 @@
               <tr id="order-detail-<?=$order->id?>" class="hidden" style="background-color:#fff">
                 <td colspan="8">
                   
-                  <div class="row">
-                    <div class="col-lg-12">
+                  <div class="card">
+                    <div class="card-body">
+                      <div class="row justify-content-center mt-2">
+                        <div class="col-xl-8 col-lg-12">
                       
-                      <div class="card">
-                        
-                        <div class="card-body">
-                          <div class="card-header bg-primary text-white pl-2 pr-2 pt-1 pb-1">Bestelljournal</div>
-                          <div class="card mb-1" style="border: 1px solid #ddd">
-                            <div class="card-header bg-light"><button type="button" class="btn btn-sm btn-info" onclick="$('#new-journal-<?=$order->id?>').toggle()"><i class="fas fa-plus"></i> Neuer Eintrag</button></div>
-                            <div id="new-journal-<?=$order->id?>" class="card-body hidden">
-                              <form method="post" action="<?=self::getUrl("OrderJournal", "save")?>">
-                                <input type="hidden" name="order_id" value="<?=$order->id?>" />
-                                <textarea name="text" class="form-control mb-2" style="height:120px;"></textarea>
-                                <button class="btn btn-sm btn-primary" type="submit"><i class="fas fa-save"></i> Speichern</button>
-                              </form>
-                            </div>
-                          </div>
-                          
-                          <?php if(is_array($order->journals) && count($order->journals)): ?>
-                            <?php foreach($order->journals as $journal): ?>
-                              <div class="card mb-1" style="border: 1px solid #ddd">
-                                <div class="card-header bg-light text-muted pl-2 pr-2 pt-1 pb-1"><span class="text-monospace font-weight-bold" style="float: right"><i class="fas fa-clock"></i> <?=date("d.m.Y H:i:s",$journal->create)?></span> Eingetragen von <strong><?=$journal->creator->name?></strong></div>
-                                <div class="card-body pl-2 pr-2 pt-1 pb-1">
-                                  <?=nl2br($journal->text)?>
+                          <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?>-details" data-toggle="tab" aria-expanded="false">Details</a></li>
+                          </ul>
+                        </div>
+                      
+                      </div>
+
+                      <div class="tab-content">
+                        <div id="order-detail-<?=$order->id?>-journal" class="tab-pane show active">
+                          <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">Bestelljournal</div>
+                                  <div class="card mb-3">
+                                    <div class="card-header bg-light"><button type="button" class="btn btn-sm btn-info" onclick="$('#new-journal-<?=$order->id?>').toggle()"><i class="fas fa-plus"></i> Neuer Eintrag</button></div>
+                                    <div id="new-journal-<?=$order->id?>" class="card-body hidden">
+                                      <form method="post" action="<?=self::getUrl("OrderJournal", "save")?>">
+                                        <input type="hidden" name="order_id" value="<?=$order->id?>" />
+                                        <textarea name="text" class="form-control mb-2" style="height:120px;"></textarea>
+                                        <button class="btn btn-sm btn-primary" type="submit"><i class="fas fa-save"></i> Speichern</button>
+                                      </form>
+                                    </div>
+                                  </div>
+
+                                  <?php if(is_array($order->journals) && count($order->journals)): ?>
+                                    <?php foreach($order->journals as $journal): ?>
+                                      <div class="card mb-1" style="border: 1px solid #ddd">
+                                        <div class="card-header bg-light text-monospace text-muted pl-2 pr-2 pt-1 pb-1"><span class="font-weight-bold" style="float: right"><i class="fas fa-clock"></i> <?=date("d.m.Y H:i:s",$journal->create)?></span> Eingetragen von <strong><?=$journal->creator->name?></strong></div>
+                                        <div class="card-body pl-2 pr-2 pt-1 pb-1">
+                                          <?=nl2br($journal->text)?>
+                                        </div>
+                                      </div>
+                                    <?php endforeach; ?>
+                                  <?php endif; ?>
                                 </div>
                               </div>
-                            <?php endforeach; ?>
-                          <?php endif; ?>
-                          
-                          
-                          
+                            </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">
+                              <div class="card">
+                                <div class="card-body">
+                              
+                                      <table class="table table-sm table-bordered">
+                                        <tr>
+                                          <th class="bg-light">Bestelldatum:</th>
+                                          <td><?=date("d.m.Y",$order->order_date)?></td>
+                                          
+                                          <th class="bg-light">Herstellbar ab:</th>
+                                          <td><?=($order->finish_after) ? date("d.m.Y",$order->finish_after) : "--.--.----" ?></td>
+                                          
+                                          <th class="bg-light">Rechnungsart:</th>
+                                          <td><?=($order->billing_type == "sepa") ? "order-date-pillSEPA" : "Rechnung"?></td>
+                                          
+                                          <th class="bg-light">Einwilligungen:</th>
+                                          <td><?=($order->allow_contact) ? "<span class='order-date-pill active'><i class='fas fa-check text-success'></i> Info</span>" : ""?> <?=($order->allow_spin) ? "<span class='order-date-pill active ml-1'><i class='fas fa-check text-success'></i> SPIN</span>" : ""?></td>
+                                        </tr>
+                                      </table>
+
+                                  
+                                  <div class="row">
+                                    <div class="form-group col-lg-4 col-md-6 col-sm-8">
+                                      <label>Vorortinstallation:</label>
+                                      <div class="input-group">
+                                        <input type="text" class="form-control datepicker" id="vororttermin-<?=$order->id?>" name="vororttermin" value="<?=($order->install_date) ? date("d.m.Y",$order->install_date) : ""?>" placeholder="--.--.----" />
+                                        <div class="input-group-append">
+                                          <button class="btn btn-outline-primary" id="vororttermin-button-<?=$order->id?>" type="button" title="Vororttermin speichern" onclick="saveVororttermin(<?=$order->id?>)"><i class="fas fa-save"></i></button>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
+
+                                  <?php if(is_array($order->products) && count($order->products)): ?>
+                                  <h4>Produkte</h4>
+                                  <table class="table table-sm table-striped">
+                                    <tr>
+                                      <th class="text-right">Pos</th>
+                                      <th class="text-right">Anzahl</th>
+                                      <th>Produkt</th>
+                                      <th>Rechn.Periode</th>
+                                      <th class="text-right">Preis p. P</th>
+                                      <th class="text-right">Preis Setup</th>
+                                      <th>Rechn.verz.</th>
+                                    </tr>
+                                    <?php foreach($order->products as $product): ?>
+                                      <tr>
+                                        <td class="text-right"><?=$product->pos?></td>
+                                        <td class="text-right"><?=$product->formatAmount()?></td>
+                                        <td>
+                                          <?=$product->product->name?>
+                                          <?php
+                                          if(
+                                            (is_array($product->product->attributes) && count($product->product->attributes))
+                                            && (array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $product->product->attributes)
+                                                && $product->product->attributes[TT_ATTRIB_TERMINATION_REQUIRED_NAME]->value == 1)
+                                            || $product->termination_id
+                                            ):
+                                          ?>
+                                          <br /><small class="text-pink"><?=$product->termination->code?> - <?= str_replace("\n", " - ", $product->termination->getAddress())?></small>
+                                          <?php endif; ?>
+                                        </td>
+                                        <td><?=($product->billing_period == 12) ? "Jährlich" : "Monatlich"?></td>
+                                        <td class="text-monospace text-right"><?=number_format($product->price, 4, ",", ".")?></td>
+                                        <td class="text-monospace text-right"><?=number_format($product->price_setup, 4, ",", ".")?></td>
+                                        <td><?=($product->billing_delay) ? $product->billing_delay : ""?></td>
+                                      </tr>
+                                    <?php endforeach; ?>
+                                  </table>
+                                  <?php endif; ?>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
                         </div>
                       </div>
-                      
                     </div>
                   </div>
                   
@@ -452,7 +545,7 @@
                                           <td><?=date("d.m.Y",$order->order_date)?></td>
                                           
                                           <th class="bg-light">Herstellbar ab:</th>
-                                          <td><?=date("d.m.Y",$order->finish_after)?></td>
+                                          <td><?=($order->finish_after) ? date("d.m.Y",$order->finish_after) : "--.--.----"?></td>
                                           
                                           <th class="bg-light">Rechnungsart:</th>
                                           <td><?=($order->billing_type == "sepa") ? "order-date-pillSEPA" : "Rechnung"?></td>