diff --git a/prototype/src/main/resources/templates/intern/customerOrders/id.html b/prototype/src/main/resources/templates/intern/customerOrders/id.html
index e69de29..7aa7c22 100644
--- a/prototype/src/main/resources/templates/intern/customerOrders/id.html
+++ b/prototype/src/main/resources/templates/intern/customerOrders/id.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+   <meta charset="utf-8">
+   <meta name="viewport" content="width=device-width, initial-scale=0.75, user-scalable=no">
+
+   <title>Artikelübersicht</title>
+   <script th:src="@{/js/filterTable.js}"></script>
+   <link rel="stylesheet" th:href="@{/css/ecom.css}" />
+</head>
+
+<body>
+   <nav th:replace="/fragments/header :: header">Header</nav>
+   <div class="sidebar-layout content-width">
+      <nav></nav>
+      <div>
+         <h1>Bestellung B-1010</h1>
+      </div>
+   </div>
+   <main class="sidebar-layout content-width">
+      <nav th:replace="/fragments/intern :: sidebar"></nav>
+      <div class="content-width">
+         <div>
+            <h2 id="20202701"> Bestellung vom 27.01.2020 </h2>
+            <div>
+               <table class="key-value">
+                  <tr>
+                     <th>Nutzer</th>
+                     <td><a th:href="@{/intern/customers/498}">K-4850</a></td>
+                  </tr>
+                  <tr>
+                     <th>Lieferstatus</th>
+                     <td><b>Unterwegs</b> <br /> Vorraussichtliche Ankunft: 29.01.2020</td>
+                  </tr>
+                  <tr>
+                     <th>Sendeverfolgungsnummer</th>
+                     <td>XE51451436DE</td>
+                  </tr>
+                  <tr>
+                     <th></th>
+                     <td>
+                        Hans Maier <br />
+                        Hauptstraße 12<br />
+                        74880 Musterstadt<br />
+                        Deutschland <br />
+                     </td>
+                  </tr>
+                  <tr>
+                     <th>Eingelösste Bonuspunkte</th>
+                     <td>10</td>
+                  </tr>
+               </table>
+            </div>
+            <table>
+               <tr>
+                  <th>Bild</th>
+                  <th>Name</th>
+                  <th>Menge</th>
+                  <th>Preis (Brutto)</th>
+               </tr>
+               <tr>
+                  <td><a th:href="@{/shop/articles/4151}"><img th:src="@{/img/product-1.jpg}" class="s" /><a></td>
+                  <td><a th:href="@{/shop/articles/4151}">Kamera<a /></td>
+                  <td> 1 </td>
+                  <td>100,50 €</td>
+               </tr>
+               <tr>
+                  <td><a th:href="@{/shop/articles/4151}"><img th:src="@{/img/product-2.jpg}" class="s" /><a /></td>
+                  <td><a th:href="@{/shop/articles/4151}">Earbuds<a /></td>
+                  <td> 3 </td>
+                  <td>63,95 €</td>
+               </tr>
+               <tr>
+                  <th></th>
+                  <th></th>
+                  <th>Position</th>
+                  <th>Preis</th>
+               </tr>
+               <tr>
+                  <td></td>
+                  <td></td>
+                  <td>Artikel (Netto)</td>
+                  <td> 120,00 € </td>
+               </tr>
+               <tr>
+                  <td></td>
+                  <td></td>
+                  <td>Bonuspunkte</td>
+                  <td> 5,00 € </td>
+               </tr>
+               <tr>
+                  <td></td>
+                  <td></td>
+                  <td>Umsatzsteuer (19%)</td>
+                  <td> 42,00 € </td>
+               </tr>
+               <tr>
+                  <td></td>
+                  <td></td>
+                  <td>
+                     <h3>Gesammtpreis</h3>
+                  </td>
+                  <td>
+                     <h3>240,79 €</h3>
+                  </td>
+               </tr>
+            </table>
+         </div>
+      </div>
+   </main>
+   <footer th:replace="/fragments/footer :: footer"></footer>
+</body>
+
+</html>
diff --git a/prototype/src/main/resources/templates/intern/customerOrders/index.html b/prototype/src/main/resources/templates/intern/customerOrders/index.html
index e69de29..165f023 100644
--- a/prototype/src/main/resources/templates/intern/customerOrders/index.html
+++ b/prototype/src/main/resources/templates/intern/customerOrders/index.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="de" dir="ltr" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+   <meta charset="utf-8">
+   <meta name="viewport" content="width=device-width, initial-scale=0.75, user-scalable=no">
+
+   <title>Artikelübersicht</title>
+   <script th:src="@{/js/filterTable.js}"></script>
+   <link rel="stylesheet" th:href="@{/css/ecom.css}" />
+</head>
+
+<body>
+   <nav th:replace="/fragments/header :: header">Header</nav>
+   <div class="sidebar-layout content-width">
+      <nav></nav>
+      <div>
+         <h1>Bestellungen</h1>
+      </div>
+   </div>
+   <main class="sidebar-layout content-width">
+      <nav th:replace="/fragments/intern :: sidebar"></nav>
+      <div class="content-width">
+         <p>
+            <table id="main-table">
+               <tr>
+                  <th colspan="6">
+                     <input type="text" placeholder="Filtern" class="smaller jsFilterTable full-width" data-target-id="main-table"></input>
+                  </th>
+               </tr>
+               <tr>
+                  <th>Kundennummer</th>
+                  <th>Bestellnummer</th>
+                  <th>Bestelldatum</th>
+                  <th>Betrag</th>
+                  <th>Status</th>
+                  <th></th>
+               </tr>
+               <tr>
+                  <td><a th:href="@{/intern/customers/48584}">101</a></td>
+                  <td>440</td>
+                  <td>2019-12-54</td>
+                  <td>10,13 EUR</td>
+                  <td>Zugestellt</td>
+                  <td><a th:href="@{/intern/customerOrders/48584}" class="a smaller">Details</a></td>
+               </tr>
+               <tr>
+                  <td><a th:href="@{/intern/customers/48584}">102</a></td>
+                  <td>241</td>
+                  <td>2019-11-10</td>
+                  <td>40,13 EUR</td>
+                  <td>In Zustellung</td>
+                  <td><a th:href="@{/intern/customerOrders/48584}" class="a smaller">Details</a></td>
+               </tr>
+               <tr>
+                  <td><a th:href="@{/intern/customers/48584}">101</a></td>
+                  <td>241</td>
+                  <td>2019-11-10</td>
+                  <td>10,13 EUR</td>
+                  <td>Erfasst</td>
+                  <td><a th:href="@{/intern/customerOrders/48584}" class="a smaller">Details</a></td>
+               </tr>
+               <tr>
+                  <td><a th:href="@{/intern/customers/48584}">755</a></td>
+                  <td>544</td>
+                  <td>2019-12-10</td>
+                  <td>45,13 EUR</td>
+                  <td>Erfasst</td>
+                  <td><a th:href="@{/intern/customerOrders/48584}" class="a smaller">Details</a></td>
+               </tr>
+            </table>
+         </p>
+      </div>
+   </main>
+   <footer th:replace="/fragments/footer :: footer"></footer>
+</body>
+
+</html>
diff --git a/prototype/src/main/resources/templates/user/orders/index.html b/prototype/src/main/resources/templates/user/orders/index.html
index 61a8117..b9846fa 100644
--- a/prototype/src/main/resources/templates/user/orders/index.html
+++ b/prototype/src/main/resources/templates/user/orders/index.html
@@ -33,6 +33,15 @@
                      <th>Sendeverfolgungsnummer</th>
                      <td>XE51451436DE</td>
                   </tr>
+                  <tr>
+                     <th></th>
+                     <td>
+                        Hans Maier <br />
+                        Hauptstraße 12<br />
+                        74880 Musterstadt<br />
+                        Deutschland <br />
+                     </td>
+                  </tr>
                   <tr>
                      <th>Eingelösste Bonuspunkte</th>
                      <td>10</td>
@@ -100,12 +109,21 @@
                <table class="key-value">
                   <tr>
                      <th>Lieferstatus</th>
-                     <td><b>Angekommen</b> <br />  03.01.2020</td>
+                     <td><b>Angekommen</b> <br /> 03.01.2020</td>
                   </tr>
                   <tr>
                      <th>Sendeverfolgungsnummer</th>
                      <td>XE5140684351DE</td>
                   </tr>
+                  <tr>
+                     <th></th>
+                     <td>
+                        Hans Maier <br />
+                        Hauptstraße 12<br />
+                        74880 Musterstadt<br />
+                        Deutschland <br />
+                     </td>
+                  </tr>
                   <tr>
                      <th>Gutgeschriebene Bonuspunkte</th>
                      <td>5</td>

Lieferstatus	Angekommen 03.01.2020	Angekommen 03.01.2020
Sendeverfolgungsnummer	XE5140684351DE
	+ Hans Maier + Hauptstraße 12 + 74880 Musterstadt + Deutschland +
Gutgeschriebene Bonuspunkte	5