diff --git a/heinrichmalerbetrieb.php b/heinrichmalerbetrieb.php
index 03421d4..c1545e6 100755
--- a/heinrichmalerbetrieb.php
+++ b/heinrichmalerbetrieb.php
@@ -20,8 +20,15 @@
       .invoice-details table {
         width: 200px;
       }
+      .client {
+        margin-top: 6rem;
+      }
       .client small.sender {
         color: #408236;
+	font-size: 0.7rem;
+      }
+      .client .client_address {
+        margin-top: 0.4rem;
       }
       table.footer th, table.footer td {
         vertical-align: top;
@@ -34,6 +41,9 @@
       hr.footer {
         color: #408236;
       }
+      h1.invoice-title {
+        color: #3a3a3a;
+      }
     </style>
 </head>
 <body>
@@ -45,8 +55,17 @@
 
     <div id="client" class="client">
 	<small class="sender">Heinrich GmbH • Blumenstraße 16-18 • 75233 Tiefenbronn</small>
-        <div>
-            <?php _htmlsc(format_client($invoice)); ?>
+	<div class="client_address">
+            <b>per Email: info@test.de</b><br>
+            <?php if ($invoice->client_title) {
+	      echo $invoice->client_title . '<br>';
+            } ?>
+            <?php if ($invoice->client_name) {
+              echo $invoice->client_name;
+            } ?>
+            <?php if ($invoice->client_surname) {
+              echo $invoice->client_surname;
+            } ?>
         </div>
         <?php if ($invoice->client_vat_id) {
             echo '<div>' . trans('vat_id_short') . ': ' . $invoice->client_vat_id . '</div>';
@@ -72,12 +91,6 @@
                 echo htmlsc($invoice->client_city);
             }
             echo '</div>';
-        }
-
-        echo '<br/>';
-
-        if ($invoice->client_phone) {
-            echo '<div>' . trans('phone_abbr') . ': ' . htmlsc($invoice->client_phone) . '</div>';
         } ?>
 
     </div>
@@ -150,7 +163,7 @@
         </table>
     </div>
 
-    <h1 class="invoice-title"><?php echo trans('invoice') . ' ' . $invoice->invoice_number; ?></h1>
+    <h1 class="invoice-title"><?php echo trans('invoice') ?></h1>
 
     <table class="item-table">
         <thead>
