diff --git a/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml b/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
index 9d0511c2c..8130774be 100644
--- a/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
@@ -159,7 +159,7 @@
 
 @helper BuildGoalTreeBranch(GoalTreeItem goalTreeItem)
 {
-    var collapseClass = Model.GoalTree.Count <= 30 ? "collapse show" : "collapse";
+	var collapseClass = Model.GoalTree.Count <= 10 ? "collapse show" : "collapse";
 
     var isChecked = Model.SelectedGoals.Any(a => a.ValueListEntryOid.HasValue && a.ValueListEntryOid.Value == goalTreeItem.ValueListEntryOid);
     var isCheckedValue = isChecked ? "checked" : string.Empty;
diff --git a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
index 5792e691b..ff9c02031 100644
--- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
@@ -319,6 +319,10 @@
 		                </div>
 		                <div class="collapse @Html.GetCollapsibleClass(Model.Collapsibles2IsShown, "goals-container")" id="goals-container">
 			                <div class="card-body p-1">
+				                @*<div class="btn-group-sm">
+					                <button type="button" class="btn btn-outline-primary" onclick="showAllGoals()">Alle auf</button>
+                                    <button type="button" class="btn btn-outline-primary" onclick="hideAllGoals()">Alle zu</button>
+				                </div>*@
 				                <div class="container p-0 m-0" id="goals-tree">
 					                @Html.Partial("GoalTreePartial", Model)
 				                </div>
diff --git a/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml b/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
index f2096635c..3149a1731 100644
--- a/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/SingleSignaturePopupPartial.cshtml
@@ -2,6 +2,17 @@
 @using BS.Shared
 @model BeWoPlanerMobil.Models.MainModel
     
+<style type="text/css">
+    .wh-100 {
+        min-width: 100% !important;
+        min-height: 100% !important;
+        max-width: 100% !important;
+        max-height: 100% !important;
+        width: 100% !important;
+        height: height: 100% !important;
+    }
+</style>
+
 <script type="text/javascript">
 
     @*
@@ -23,6 +34,7 @@
 	*@
 	function updateSingleSignatureCanvas(canvasContainerId, canvasId) {
 		const containerWidth = $(`#${canvasContainerId}`).innerWidth();
+
 		const sourceCanvas = document.getElementById(canvasId);
 
 		if(sourceCanvas === null || sourceCanvas === undefined) {
@@ -30,7 +42,7 @@
 		}
 
 		const canvasWidth = sourceCanvas.scrollWidth;
-		const newWidth = containerWidth;
+		const newWidth = containerWidth - 10;
 
 		const parsedNewWidth = parseInt(newWidth, 10);
 		const parsedCanvasWidth = parseInt(canvasWidth, 10);
@@ -96,14 +108,20 @@
 
 		function saveBtnListener(event) {
 			singleSignatureSaveButtonEvent(serviceRecordOid);
+
+			event.stopPropagation();
 		}
 
 		function clearBtnListener(event) {
 			singleSignatureClearButtonEvent(signaturePad);
+
+            event.stopPropagation();
 		}
 
 		function closeBtnListener(event) {
 			singleSignatureCloseButtonEvent(signaturePad);
+
+            event.stopPropagation();
 		}
 
 		saveButtonClone.addEventListener("click", saveBtnListener);
@@ -182,6 +200,15 @@
 	function singleSignatureClearButtonEvent(signaturePad) {
 		signaturePad.clear();
 	}
+
+    function signatureFooterClick() {
+	    const chevron = $("#single-signature-info-chevron");
+	    const isOpen = chevron.hasClass("fa-chevron-up");
+	    chevron.removeClass(isOpen ? "fa-chevron-up": "fa-chevron-down");
+	    chevron.addClass(isOpen ? "fa-chevron-down" : "fa-chevron-up");
+
+		$("#single-signature-collapse").collapse("toggle");
+    }
 </script>
 
 @if(Model.ServiceRecord2Monatsunterschrift is null)
@@ -207,84 +234,80 @@ 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 id="single-signature-modal" class="modal m-0 wh-100" tabindex="-1" role="dialog" data-backdrop="static">
+		<div class="modal-dialog wh-100" role="document">
 			<div class="modal-content">
-				<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>
+				<div class="modal-body p-0">
+                    <div class="card">
+                        <div class="card-body p-0">
+	                        <div id="single-signature-canvas-row">
+		                        <div class="canvas-container" style="margin: 0 auto;" id="single-signature-canvas-container">
+			                        <canvas id="single-signature-sketch-pad" class="bg-white m-1" style="border: 1px solid #343A40;" width="500" height="200"></canvas>
+		                        </div>
+	                        </div>
+                        </div>
+                        <div class="card-footer p-0" onclick="signatureFooterClick()">
+	                        <div class="d-inline-flex">
+		                        <button type="button" class="btn-sm btn text-primary">
+			                        <i class="fas fa-chevron-down text-primary" id="single-signature-info-chevron"></i>
+			                        Unterschrift von @Model.ServiceRecord2Monatsunterschrift.ServiceRecord.Customer.LastNameFirstName
+		                        </button>
+	                        </div>
+	                        <div class="d-inline-flex float-right">
+		                        <button type="button" class="btn btn-secondary btn-sm m-1" id="single-signature-cancel-btn">Abbrechen</button>
+		                        <button type="button" class="btn btn-primary btn-sm m-1" id="single-signature-clear-btn">Neu</button>
+		                        <button type="button" class="btn btn-primary btn-sm m-1 mr-2" id="single-signature-ok-btn">OK</button>
+	                        </div>
+                        </div>
+                        <div class="collapse" id="single-signature-collapse">
+	                        <table class="table table-sm table-striped service-record-table 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>
 
 					<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 class="modal-footer">
-					<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>