diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index b52d87a9a..6fc54f2ae 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -50,7 +50,7 @@ namespace BeWoPlanerMobil.Controllers
         public bool SkipModelInitialization { get; set; }
 
         public bool SkipServiceRecordInitialization { get; set; }
-
+        
         public MainModel Model
         {
             get
diff --git a/BeWoPlanerMobil/Views/Main/RestoreServiceRecordInputsPartial.cshtml b/BeWoPlanerMobil/Views/Main/RestoreServiceRecordInputsPartial.cshtml
index 817b441c5..02201c53f 100644
--- a/BeWoPlanerMobil/Views/Main/RestoreServiceRecordInputsPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/RestoreServiceRecordInputsPartial.cshtml
@@ -389,6 +389,8 @@
 	}
 
 	function readWholeLocalStorage() {
+        console.log(`Es wurden ${localStorage.length} lokale gespeicherte Werte gefunden:`);
+
 		logInfo3(`Es wurden ${localStorage.length} lokale gespeicherte Werte gefunden:`);
 
 		for(let i = 0; i < localStorage.length; i++) {
@@ -445,26 +447,27 @@
 
     if(Html.IsInDebugMode())
     {
-	    <div class="btn-group">
-			<button type="button" class="btn btn-outline-danger" onclick="deleteBwpLocalStorage()">
-				<i class="fas fa-trash"></i>
-			</button>
-			<button type="button" class="btn btn-outline-info" onclick="readWholeLocalStorage()">
-				<i class="far fa-eye"></i>
-			</button>
-			<script type="text/javascript">
-				function devTest() {
-					try {
-						
-					} catch(error) {
-						console.error(error);
-					}
-				}
-			</script>
-			<button class="btn btn-outline-primary" type="button" onclick="devTest()">
-				<i class="fas fa-bug"></i>
-			</button>
-	    </div>
+<div class="btn-group">
+    <button type="button" class="btn btn-outline-danger" onclick="deleteBwpLocalStorage()">
+        <i class="fas fa-trash"></i>
+    </button>
+    
+    <button type="button" class="btn btn-outline-info" onclick="readWholeLocalStorage()">
+        <i class="far fa-eye"></i>
+    </button>
+    <script type="text/javascript">
+        function devTest() {
+            try {
+                console.warn("Diese Methode ist noch ohne Funktion.");
+            } catch(error) {
+                console.error(error);
+            }
+        }
+    </script>
+    <button class="btn btn-outline-primary" type="button" onclick="devTest()">
+        <i class="fas fa-bug"></i>
+    </button>
+</div>
 	    
     }
 }
diff --git a/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
index c5429d124..f2096635c 100644
--- a/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
@@ -1,4 +1,5 @@
 @using BeWoPlanerMobil.Util
+@using BS.Shared
 @model BeWoPlanerMobil.Models.MainModel
     
 <script type="text/javascript">
@@ -206,73 +207,84 @@ else
 
 	var info = $"{nameAndDateOfBirth} | {supportConceptTimeSpan}";
 
+	var klient = Model.ServiceRecord2Monatsunterschrift.ServiceRecord.Customer.Sex == Sex.Male ? "Klient" : "Klientin";
+
 	<div id="sr-sg-container"></div>
 
 	<div id="single-signature-modal" class="modal" tabindex="-1" role="dialog" data-backdrop="static">
 		<div class="modal-dialog modal-xl modal-dialog-scrollable" style="max-width: 98% !important;" role="document">
 			<div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title">Unterschrift</h5>
-					<button type="button" class="close" data-dismiss="modal">
-						<span>&times;</span>
-					</button>
-				</div>
-                <div class="modal-body">
-                    <table class="table table-sm table-striped service-record-table m-0">
-	                    <tr>
-		                    <td class="text-secondary">
-			                    Hilfeplan:
-		                    </td>
-		                    <td>
-								@info
-		                    </td>
-	                    </tr>
-	                    <tr>
-		                    <td class="text-secondary">
-			                    Kategorie
-		                    </td>
-		                    <td>
-								@Model.ServiceRecord2Monatsunterschrift.Kategorie
-		                    </td>
-	                    </tr>
-	                    <tr>
-		                    <td class="text-secondary">
-			                    Leistung
-		                    </td>
-		                    <td>
-			                    @Model.ServiceRecord2Monatsunterschrift.Leistung
-		                    </td>
-	                    </tr>
-	                    <tr>
-		                    <td class="text-secondary">
-			                    Mitarbeiter
-		                    </td>
-		                    <td>
-								@Model.ServiceRecord2Monatsunterschrift.Mitarbeiter
-		                    </td>
-	                    </tr>
-	                    <tr>
-		                    <td class="text-secondary">
-			                    Datum / Uhrzeit
-		                    </td>
-		                    <td>
-								@Model.ServiceRecord2Monatsunterschrift.DatumSchraegstrichUhrzeit
-		                    </td>
-	                    </tr>
-                    </table>
+				<div class="modal-body">
+					<div class="card w-100" style="overflow-y: scroll !important;">
+						<div class="card-header small" onclick="cardHeaderClick2(this)">
+                            <div class="d-inline-flex text-primary h-100">
+                                <i class="text-primary fas @Html.GetCollapsibleChevron(Model, "single-signature-collapse")"></i>
+                                <button type="button" class="btn btn-link">
+                                    Unterschrift von @klient @Model.ServiceRecord2Monatsunterschrift.ServiceRecord.Customer.LastNameFirstName für den Eintrag vom @Model.ServiceRecord2Monatsunterschrift.DatumSchraegstrichUhrzeit
+                                </button>
+                            </div>
+							
+						</div>
+						<div class="collapse" id="single-signature-collapse">
+							<div class="card-body p-1 w-100">
+								<table class="table table-sm table-striped service-record-table m-0 w-100">
+									<tr>
+										<td class="text-secondary">
+											Hilfeplan:
+										</td>
+										<td>
+											@info
+										</td>
+									</tr>
+									<tr>
+										<td class="text-secondary">
+											Kategorie
+										</td>
+										<td>
+											@Model.ServiceRecord2Monatsunterschrift.Kategorie
+										</td>
+									</tr>
+									<tr>
+										<td class="text-secondary">
+											Leistung
+										</td>
+										<td>
+											@Model.ServiceRecord2Monatsunterschrift.Leistung
+										</td>
+									</tr>
+									<tr>
+										<td class="text-secondary">
+											Mitarbeiter
+										</td>
+										<td>
+											@Model.ServiceRecord2Monatsunterschrift.Mitarbeiter
+										</td>
+									</tr>
+									<tr>
+										<td class="text-secondary">
+											Datum / Uhrzeit
+										</td>
+										<td>
+											@Model.ServiceRecord2Monatsunterschrift.DatumSchraegstrichUhrzeit
+										</td>
+									</tr>
+								</table>
+							</div>
+						</div>
+					</div>
 
-                    <input type="hidden" id="service-record-oid-holder" value="@Model.ServiceRecord2Monatsunterschrift.ServiceRecord.ServiceRecordOid" />
-                    
-                    <div class="mt-3" id="single-signature-canvas-row">
-	                    <div class="canvas-container" id="single-signature-canvas-container">
+					<input type="hidden" id="service-record-oid-holder" value="@Model.ServiceRecord2Monatsunterschrift.ServiceRecord.ServiceRecordOid"/>
+
+					<div class="mt-3" id="single-signature-canvas-row">
+						<div class="canvas-container" id="single-signature-canvas-container">
 							<canvas id="single-signature-sketch-pad" class="bg-white" style="border: 1px solid #343A40;" width="500" height="200"></canvas>
-	                    </div>
-                    </div>
-                </div>
+						</div>
+					</div>
+				</div>
 				<div class="modal-footer">
-					<button type="button" class="btn btn-secondary" id="single-signature-cancel-btn">Abbrechen</button>
-					<button type="button" class="btn btn-primary" id="single-signature-clear-btn">Neu</button>
-					<button type="button" class="btn btn-primary" id="single-signature-ok-btn">OK</button>
+					<button type="button" class="btn btn-secondary btn-sm" id="single-signature-cancel-btn">Abbrechen</button>
+					<button type="button" class="btn btn-primary btn-sm" id="single-signature-clear-btn">Neu</button>
+					<button type="button" class="btn btn-primary btn-sm" id="single-signature-ok-btn">OK</button>
 				</div>
 			</div>
 		</div>