diff --git a/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart b/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart
index 0a6091d6..e1045b8d 100644
--- a/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart
+++ b/Frontend/lib/mih_packages/patient_manager/pat_manager/pat_manager.dart
@@ -26,6 +26,9 @@ class PatManager extends StatefulWidget {
 
 class _PatManagerState extends State<PatManager> {
   bool _isLoadingInitialData = true;
+  late final WaitingRoom _waitingRoom;
+  late final MyPatientList _myPatientList;
+  late final MihPatientSearch _mihPatientSearch;
 
   Future<void> _loadInitialData() async {
     setState(() {
@@ -59,6 +62,9 @@ class _PatManagerState extends State<PatManager> {
   @override
   void initState() {
     super.initState();
+    _waitingRoom = WaitingRoom();
+    _myPatientList = MyPatientList();
+    _mihPatientSearch = MihPatientSearch();
     _loadInitialData();
   }
 
@@ -131,12 +137,11 @@ class _PatManagerState extends State<PatManager> {
   }
 
   List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      WaitingRoom(),
-      MyPatientList(),
-      MihPatientSearch(),
+    return [
+      _waitingRoom,
+      _myPatientList,
+      _mihPatientSearch,
     ];
-    return toolBodies;
   }
 
   List<String> getToolTitle() {
diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart
index 50e8e185..0cae70bd 100644
--- a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart
+++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_profile.dart
@@ -29,6 +29,10 @@ class PatientProfile extends StatefulWidget {
 
 class _PatientProfileState extends State<PatientProfile> {
   bool _isLoadingInitialData = true;
+  late final PatientInfo _patientInfo;
+  late final PatientConsultation _patienConsultation;
+  late final PatientDocuments _patientDocuments;
+  late final PatientClaimOrStatement _patientClaimOrStatement;
 
   Future<void> _loadInitialData() async {
     setState(() {
@@ -75,6 +79,10 @@ class _PatientProfileState extends State<PatientProfile> {
   @override
   void initState() {
     super.initState();
+    _patientInfo = PatientInfo();
+    _patienConsultation = PatientConsultation();
+    _patientDocuments = PatientDocuments();
+    _patientClaimOrStatement = PatientClaimOrStatement();
     _loadInitialData();
   }
 
@@ -151,13 +159,12 @@ class _PatientProfileState extends State<PatientProfile> {
   }
 
   List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      PatientInfo(),
-      PatientConsultation(),
-      PatientDocuments(),
-      PatientClaimOrStatement(),
+    return [
+      _patientInfo,
+      _patienConsultation,
+      _patientDocuments,
+      _patientClaimOrStatement,
     ];
-    return toolBodies;
   }
 
   List<String> getToolTitle() {
diff --git a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart
index cc968072..bafd272e 100644
--- a/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart
+++ b/Frontend/lib/mih_packages/patient_manager/pat_profile/patient_set_up.dart
@@ -15,6 +15,14 @@ class PatientSetUp extends StatefulWidget {
 }
 
 class _PatientSetUpState extends State<PatientSetUp> {
+  late final PatientSetupForm _patientSetupForm;
+
+  @override
+  void initState() {
+    super.initState();
+    _patientSetupForm = PatientSetupForm();
+  }
+
   @override
   Widget build(BuildContext context) {
     return MihPackage(
@@ -57,10 +65,9 @@ class _PatientSetUpState extends State<PatientSetUp> {
   }
 
   List<Widget> getToolBody() {
-    List<Widget> toolBodies = [
-      PatientSetupForm(),
+    return [
+      _patientSetupForm,
     ];
-    return toolBodies;
   }
 
   List<String> getToolTitle() {