diff --git a/Server/Components/Layout/MainLayout.razor b/Server/Components/Layout/MainLayout.razor
index d3d9446..064d4d5 100644
--- a/Server/Components/Layout/MainLayout.razor
+++ b/Server/Components/Layout/MainLayout.razor
@@ -6,10 +6,7 @@
   </div>
 
   <main>
-    <div class="top-row px-4">
-      <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
-    </div>
-
+    <div class="top-row px-4"></div>
     <article class="content px-4">
       @Body
     </article>
diff --git a/Server/Components/Pages/InvoiceListPage.razor b/Server/Components/Pages/InvoiceListPage.razor
index 16afeb4..e812110 100644
--- a/Server/Components/Pages/InvoiceListPage.razor
+++ b/Server/Components/Pages/InvoiceListPage.razor
@@ -5,9 +5,11 @@
 
 <h3>Rechnungen (@((Invoices ?? []).Count))</h3>
 
+<a href="/create" class="btn btn-primary">Neue Rechnung</a>
+<hr />
+<div class="row">
 @foreach (var invoice in Invoices ?? [])
 {
-  <div class="row">
     <div class="col-md-auto pt-3">
       <div class="card" style="width: 18rem;">
         <div class="card-body">
@@ -26,5 +28,5 @@
         </div>
       </div>
     </div>
-  </div>
-}
\ No newline at end of file
+}
+</div>
\ No newline at end of file
diff --git a/Server/Components/Pages/InvoicePage.razor b/Server/Components/Pages/InvoicePage.razor
index 41c6d31..ad49087 100644
--- a/Server/Components/Pages/InvoicePage.razor
+++ b/Server/Components/Pages/InvoicePage.razor
@@ -7,7 +7,7 @@
 
 
 
-<h1>@Invoice.InvoiceId</h1>
+<h1>Rechnung #@Invoice.InvoiceId</h1>
 
 <button type="button" class="btn btn-primary" @onclick="SaveInvoiceAsync">Speichern</button>
 <button type="button" class="btn btn-info" @onclick="GenerateInvoiceAsync">Generieren</button>
diff --git a/Server/Components/Pages/SettingsPage.razor b/Server/Components/Pages/SettingsPage.razor
index 991b65a..af0af8a 100644
--- a/Server/Components/Pages/SettingsPage.razor
+++ b/Server/Components/Pages/SettingsPage.razor
@@ -5,70 +5,70 @@
 
 <h3>Einstellungen</h3>
 
-<button type="button" class="btn btn-primary" @onclick="Save">Save</button>
+<button type="button" class="btn btn-primary" @onclick="Save">Speichern</button>
 
 <hr />
 
 <div class="mb-3">
-  <label class="form-label" >Name</label>
+  <label class="form-label">Name</label>
   <InputText DisplayName="Name" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.Name"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >Name 2</label>
+  <label class="form-label">Name 2</label>
   <InputText DisplayName="Name 2" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.Name2"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >Street</label>
+  <label class="form-label">Street</label>
   <InputText DisplayName="Street" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.Street"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >Zip</label>
+  <label class="form-label">Zip</label>
   <InputText DisplayName="Zip" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.Zip"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >City</label>
+  <label class="form-label">City</label>
   <InputText DisplayName="City" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.City"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >Phone</label>
+  <label class="form-label">Phone</label>
   <InputText DisplayName="Phone" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.Phone"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >Web</label>
+  <label class="form-label">Web</label>
   <InputText DisplayName="Web" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.Web"></InputText>
 </div>
 
 <hr />
 
 <div class="mb-3">
-  <label class="form-label" >Comment</label>
+  <label class="form-label">Comment</label>
   <InputTextArea DisplayName="Comment" class="form-control" @bind-Value="@SettingsData.Instance.Comment"></InputTextArea>
 </div>
 
 <hr />
 
 <div class="mb-3">
-  <label class="form-label" >TaxId</label>
+  <label class="form-label">TaxId</label>
   <InputText DisplayName="TaxId" class="form-control" @bind-Value="@SettingsData.Instance.SellerAddress.TaxId"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >Bank</label>
+  <label class="form-label">Bank</label>
   <InputText DisplayName="Bank" class="form-control" @bind-Value="@SettingsData.Instance.PaymentData.BankName"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >IBAN</label>
+  <label class="form-label">IBAN</label>
   <InputText DisplayName="IBAN" class="form-control" @bind-Value="@SettingsData.Instance.PaymentData.Iban"></InputText>
 </div>
 
 <div class="mb-3">
-  <label class="form-label" >BIC</label>
+  <label class="form-label">BIC</label>
   <InputText DisplayName="BIC" class="form-control" @bind-Value="@SettingsData.Instance.PaymentData.Bic"></InputText>
 </div>