diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index d6934346e..1f3084e87 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -314,6 +314,7 @@
     <Compile Include="Controllers\ReportViewerController.cs" />
     <Compile Include="Controllers\SchedulerController.cs" />
     <Compile Include="Models\AbstractModel.cs" />
+    <Compile Include="Models\DevExpressSchedulerSessionModel.cs" />
     <Compile Include="Models\MokZiel.cs" />
     <Compile Include="Models\MokSupportConceptListObject.cs" />
     <Compile Include="Models\MokMandator.cs" />
diff --git a/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs b/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs
index 801b71f6d..ed83c92bc 100644
--- a/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs
+++ b/BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs
@@ -63,6 +63,7 @@ namespace BeWoPlanerMobil.Controllers
             return View(Model);
         }
 
+
         [Authorize]
         public ActionResult SchedulerPagePartial()
         {
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index f13a29168..d9bb9738e 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -948,12 +948,6 @@ namespace BeWoPlanerMobil.Controllers
                 item.IsLeaf = true;
             }
 
-            //goalTree = goalTree.OrderBy(o => o.ValueListEntryOid).ToList();
-            //foreach(var item in goalTree)
-            //{
-            //    SortGoals(item);
-            //}
-
             return goalTree;
         }
 
@@ -3352,13 +3346,6 @@ namespace BeWoPlanerMobil.Controllers
                 return RedirectToActionPermanent("Customer", "Customer", new { id = Model.SelectedSupportConcept.Customer.Oid });
             }
 
-            //if(Model?.SelectedSupportConcept is null && (CustomerModel)Session[ModelSessionConstants.CustomerModelKey] != null)
-            //{
-            //    var customerModel = (CustomerModel) Session[ModelSessionConstants.CustomerModelKey];
-            //    customerModel.SelectedCustomerOid = null;
-            //    customerModel.SelectedCustomer = null;
-            //}
-
             return RedirectToActionPermanent("Customer", "Customer");
         }
 
@@ -5123,17 +5110,16 @@ namespace BeWoPlanerMobil.Controllers
         }
 
         [Authorize]
-        public ActionResult ReloadGoals(bool forceReload = false)
+        public ActionResult ReloadGoals()
         {
             SkipModelInitialization = true;
-            if (!IsUserLoggedIn())
+
+            if(!IsUserLoggedIn())
             {
                 TempData[TempDataConstants.DoLogoutKey] = true;
             }
 
-            //LoadGoals();
-
-            CreateModelSupportConceptListObjects(forceReload);
+            CreateModelSupportConceptListObjects(false);
             LoadSupportConceptThings(null, true);
             Model.GoalRatingTypes = OperationsService.GetAllRatingTypes().OrderBy(o => o.Position).ToList();
             Model.HasAnyRatingTypes = Model.HasRightToRateGoals && Model.GoalRatingTypes.Any();
diff --git a/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs b/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs
new file mode 100644
index 000000000..f2c8276a6
--- /dev/null
+++ b/BeWoPlanerMobil/Models/DevExpressSchedulerSessionModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace BeWoPlanerMobil.Models
+{
+    public class DevExpressSchedulerSessionModel
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Models/MainModel.cs b/BeWoPlanerMobil/Models/MainModel.cs
index 17934d2d4..a9f10e9cd 100644
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -832,7 +832,7 @@ namespace BeWoPlanerMobil.Models
         #region ServiceRecord-Pagination
         public int ServiceRecordCount { get; set; }
 
-        public int CurrentPage { get { return MainSessionModel.CurrentPage; } set { MainSessionModel.CurrentPage = value; } }
+        public int CurrentPage { get => MainSessionModel.CurrentPage; set => MainSessionModel.CurrentPage = value; }
 
         public int MaxResults { get; set; } = 10;
 
diff --git a/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerHelper.cs b/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerHelper.cs
index b697fd032..7371ff96d 100644
--- a/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerHelper.cs
+++ b/BeWoPlanerMobil/Views/DevExpressScheduler/SchedulerHelper.cs
@@ -5,7 +5,26 @@ using DevExpress.Web.Mvc;
 using DevExpress.XtraScheduler;
 using DayView = DevExpress.Web.ASPxScheduler.DayView;
 
-// TODO: Ist veraltet!
+// TODO: 
+
+/*
+ *
+ * ToDo am 08.12.2025: Folgende Klassen erstellen:
+ *
+ * 1: SchedulerDataHelper mit Datenbankzugriffen
+ *      GetAppointments()
+ *      GetResources()
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ * 1. SchedulerDataObject
+ *
+ */
+
 namespace BeWoPlanerMobil.Views.DevExpressScheduler
 {
     public static class SchedulerHelper
diff --git a/BeWoPlanerMobil/Views/Main/GoalRatingPopupContentPartial.cshtml b/BeWoPlanerMobil/Views/Main/GoalRatingPopupContentPartial.cshtml
index fd25861cd..f5e19af42 100644
--- a/BeWoPlanerMobil/Views/Main/GoalRatingPopupContentPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GoalRatingPopupContentPartial.cshtml
@@ -15,29 +15,29 @@
 <script type="text/javascript">
     function rateGoal(ratingTypeOid) {
         try {
-            var goalOid = $("#goal-to-rate-oid").val();
+	        var goalOid = $("#goal-to-rate-oid").val();
 
-            window.updateGoalRating("@Model.BookingModePrefix", goalOid, ratingTypeOid);
+	        window.updateGoalRating("@Model.BookingModePrefix", goalOid, ratingTypeOid);
 
-            $.get("@Url.Action("RateSelectedGoal")",
-	            {
-                    ratingTypeOid: ratingTypeOid,
-                    goalOid: goalOid
-	            }).done(
-                function (result) {
-                    if(false === checkJson(result)) {
-                        hideSpinner();
-                        return;
-                    }
+	        $.get("@Url.Action("RateSelectedGoal")",
+		        {
+			        ratingTypeOid: ratingTypeOid,
+			        goalOid: goalOid
+		        }).done(
+		        function (result) {
+			        if(false === checkJson(result)) {
+				        hideSpinner();
+				        return;
+			        }
 
-                    const obj = parseJason(result);
+			        const obj = parseJason(result);
 
-                    $(`#goal-rating-${goalOid}`).text(obj.RatingName);
-                    $(`#${goalOid}`).prop("checked", true);
-                    hideGoalRatingPopup();
-                    $("#goal-to-rate-oid").val("");
-                }
-            );
+			        $(`#goal-rating-${goalOid}`).text(obj.RatingName);
+			        $(`#${goalOid}`).prop("checked", true);
+			        hideGoalRatingPopup();
+			        $("#goal-to-rate-oid").val("");
+		        }
+	        );
         } catch(error) {
             showErrorPopup(error);
         }
diff --git a/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml b/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
index 8130774be..31335db60 100644
--- a/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GoalTreePartial.cshtml
@@ -175,7 +175,7 @@
     {
         var selectedGoal = Model.SelectedGoals.FirstOrDefault(f => f.ValueListEntryOid.HasValue && f.ValueListEntryOid.Value == goalTreeItem.ValueListEntryOid);
 
-        if(!(selectedGoal is null))
+        if(selectedGoal != null)
         {
             ratingType = Model.GoalRatingTypes.FirstOrDefault(f => f.RatingTypeOid.HasValue && f.RatingTypeOid.Value == selectedGoal.RatingTypeOid);
         }
diff --git a/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml b/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml
index 64ad8066b..f6250c9c6 100644
--- a/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml
@@ -22,11 +22,29 @@
 
 		updateLocallyStoredGroupBookingCb2ScRelOids();
 
-		$("#gb-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRel")", { relOid: relOid }, function() {
-			$("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
-				toggleGroupBookingForm();
+        $("#gb-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRel")", {relOid: relOid}, function() {
+            if($("#goals-tree").length <= 0) {
+                toggleGroupBookingForm();
 
-				$("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
+                if($("#tree").length <= 0) {
+	                hideSpinner();
+	                return;
+                }
+
+	            $("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
+		            hideSpinner();
+	            });
+            }
+
+            $("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
+                toggleGroupBookingForm();
+
+                if($("#tree").length <= 0) {
+	                hideSpinner();
+	                return;
+                }
+
+                $("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
 					hideSpinner();
 				});
 			});
diff --git a/BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml b/BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml
index c4ff2a268..cfe778130 100644
--- a/BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml
@@ -82,6 +82,10 @@
 				</div>
 				<div class="collapse @Html.GetCollapsibleClass(Model.Collapsibles2IsShown, "goals-container")" id="goals-container">
 					<div class="card-body p-1">
+						<div class="btn-group btn-group-sm mb-1 w-100" role="group">
+							<button type="button" class="btn btn-outline-primary" onclick="window.showAllGoals()">Alle auf</button>
+							<button type="button" class="btn btn-outline-primary" onclick="window.hideAllGoals()">Alle zu</button>
+						</div>
 						<div class="container p-0" id="goals-tree">
 							@Html.Partial("GoalTreePartial", Model)
 						</div>
diff --git a/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml b/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml
index 2b8d3acc2..58df8c541 100644
--- a/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml
@@ -23,9 +23,27 @@
 		updateLocallyStoredMultiBookingCb2ScRelOids();
 
         $("#mb-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRelFromMultiBooking")", { relOid: relOid }, function() {
-			$("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
+		    if($("#goals-tree").length <= 0) {
+				changeMultiBookingFormEnableState($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
+
+                if($("#tree").length <= 0) {
+					hideSpinner();
+					return;
+                }
+
+				$("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
+					hideSpinner();
+				});
+		    }
+
+		    $("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
                 changeMultiBookingFormEnableState($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
 
+                if($("#tree").length <= 0) {
+	                hideSpinner();
+	                return;
+                }
+
 				$("#tree").load("@Url.Action("LoadUpToDateTextModules")", function() {
 					hideSpinner();
 				});