diff --git a/Programm/main.py b/Programm/main.py
index b57ee20..6b3bf56 100644
--- a/Programm/main.py
+++ b/Programm/main.py
@@ -58,20 +58,20 @@ class Main_Window(CTk):
         self.logo.pack(padx=5, pady=20)
         
         self.img_dashboard = CTkImage(dark_image=Image.open("img/icons/analytics_white.png"), light_image=Image.open("img/icons/analytics_white.png"))
-        self.button1 = CTkButton(master=self.sidebar_frame, image=self.img_dashboard, text="Dashboard", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=self.initiate_window_1)
+        self.button1 = CTkButton(master=self.sidebar_frame, image=self.img_dashboard, text="Dashboard", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=lambda: self.initiate_window(1))
         self.button1.pack(padx=5, pady=5)
 
         self.img_edit = CTkImage(dark_image=Image.open("img/icons/pen_white.png"), light_image=Image.open("img/icons/pen_white.png"))
-        self.button2 = CTkButton(master=self.sidebar_frame, image=self.img_edit, text="Eintragen", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=self.initiate_window_2)
+        self.button2 = CTkButton(master=self.sidebar_frame, image=self.img_edit, text="Eintragen", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=lambda: self.initiate_window(2))
         self.button2.pack(padx=5, pady=5)
 
 
         self.img_table = CTkImage(dark_image=Image.open("img/icons/table_white.png"), light_image=Image.open("img/icons/table_white.png"))
-        self.button3 = CTkButton(master=self.sidebar_frame, image=self.img_table, text="Werte", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=self.initiate_window_3)
+        self.button3 = CTkButton(master=self.sidebar_frame, image=self.img_table, text="Werte", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=lambda: self.initiate_window(3))
         self.button3.pack(padx=5, pady=5)
         
         self.img_users = CTkImage(dark_image=Image.open("img/icons/group_white.png"), light_image=Image.open("img/icons/group_white.png"))
-        self.button4 = CTkButton(master=self.sidebar_frame, image=self.img_users, text="Sportler", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=self.initiate_window_4)
+        self.button4 = CTkButton(master=self.sidebar_frame, image=self.img_users, text="Sportler", fg_color="transparent", font=("Arial Bold", 14), hover_color=contrastColor, anchor="w", command=lambda: self.initiate_window(4))
         self.button4.pack(padx=5, pady=5)
         
         self.img_settings = CTkImage(dark_image=Image.open("img/icons/settings_white.png"), light_image=Image.open("img/icons/settings_white.png"))
@@ -85,33 +85,36 @@ class Main_Window(CTk):
         
         
         self.lastButton = None
-        self.initiate_window_1()
-            
-    def initiate_window_1(self):
-        self.updateButton(self.button1)
+        self.initiate_window(1)
         
+    def initiate_window(self,windowNumber):
         self.clear_frame()
+        if(windowNumber==1):
+            self.updateButton(self.button1)
+            self.initiate_window_1()
+        elif(windowNumber==2):
+            self.updateButton(self.button2)
+            self.initiate_window_2()
+        elif(windowNumber==3):
+            self.updateButton(self.button3)
+            self.initiate_window_3()
+        elif(windowNumber==4):
+            self.updateButton(self.button4)
+            self.initiate_window_4()
+        
+    def initiate_window_1(self):
         self.buttonTest = CTkButton(master=self.main_container, text="Dashboard", fg_color=contrastColor, font=("Arial Bold", 14), hover_color=mainColor, anchor="center")
         self.buttonTest.pack(padx=5, pady=5,expand=True)
         
     def initiate_window_2(self):
-        self.updateButton(self.button2)
-        
-        self.clear_frame()
         self.buttonTest = CTkButton(master=self.main_container, text="Eintragen", fg_color=contrastColor, font=("Arial Bold", 14), hover_color=mainColor, anchor="center")
         self.buttonTest.pack(padx=5, pady=5,expand=True)
         
     def initiate_window_3(self):
-        self.updateButton(self.button3)
-        
-        self.clear_frame()
         self.buttonTest = CTkButton(master=self.main_container, text="Werte", fg_color=contrastColor, font=("Arial Bold", 14), hover_color=mainColor, anchor="center")
         self.buttonTest.pack(padx=5, pady=5,expand=True)
         
     def initiate_window_4(self):
-        self.updateButton(self.button4)
-        
-        self.clear_frame()
         self.buttonTest = CTkButton(master=self.main_container, text="Spieler", fg_color=contrastColor, font=("Arial Bold", 14), hover_color=mainColor, anchor="center")
         self.buttonTest.pack(padx=5, pady=5,expand=True)