diff --git a/src/brovski-adress-etiketten-verwaltung.py b/src/brovski-adress-etiketten-verwaltung.py
index 17379bd..0548bf2 100644
--- a/src/brovski-adress-etiketten-verwaltung.py
+++ b/src/brovski-adress-etiketten-verwaltung.py
@@ -36,6 +36,25 @@ class InsertRecord(Window):
     def __init__(self, root: tk.Tk):
         super().__init__(root)
         self.title("Adresse einfügen")
+
+        edit_frame = tk.Frame(self.root)
+        edit_frame.pack(side=tk.TOP, fill=tk.X)
+        tk.Label(edit_frame, text="Aktiv").grid(row=0, column=0)
+        tk.Label(edit_frame, text="Firma").grid(row=0, column=1)
+        tk.Label(edit_frame, text="Name").grid(row=0, column=2)
+        tk.Label(edit_frame, text="Strasse").grid(row=0, column=3)
+        tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4)
+        edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
+        edit_aktiv.grid(row=1, column=0)
+        edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
+        edit_firma.grid(row=1, column=1)
+        edit_name = tk.Entry(edit_frame, textvariable=self.name)
+        edit_name.grid(row=1, column=2)
+        edit_strasse = tk.Entry(edit_frame, textvariable=self.strasse)
+        edit_strasse.grid(row=1, column=3)
+        edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
+        edit_plz_ort.grid(row=1, column=4)
+        tk.Button(edit_frame, text="Update", command=self.update_record, width=button_width).grid(row=1, column=5)
         tk.Button(self, text="Abbrechen", command=self.close_window).pack()
 
 
@@ -197,6 +216,7 @@ class Application:
         tk.Button(top_frame, text="Insert", command=self.insert_record, width=button_width).pack(side=tk.LEFT)
         tk.Button(top_frame, text="Delete", command=self.delete_record, width=button_width).pack(side=tk.LEFT)
         tk.Button(top_frame, text="Export CSV", command=self.export_csv, width=button_width).pack(side=tk.LEFT)
+        tk.Button(top_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).pack(side=tk.LEFT)
         tk.Button(top_frame, text="Quit", command=self.on_close, width=button_width).pack(side=tk.RIGHT)
         tk.Button(top_frame, text="Settings", command=self.show_settings, width=button_width).pack(side=tk.RIGHT)
 
@@ -206,25 +226,6 @@ class Application:
         self.strasse = tk.StringVar()
         self.plz_ort = tk.StringVar()
 
-        edit_frame = tk.Frame(self.root)
-        edit_frame.pack(side=tk.TOP, fill=tk.X)
-        tk.Label(edit_frame, text="Aktiv").grid(row=0, column=0)
-        tk.Label(edit_frame, text="Firma").grid(row=0, column=1)
-        tk.Label(edit_frame, text="Name").grid(row=0, column=2)
-        tk.Label(edit_frame, text="Strasse").grid(row=0, column=3)
-        tk.Label(edit_frame, text="Plz/Ort").grid(row=0, column=4)
-        edit_aktiv = tk.Checkbutton(edit_frame, variable=self.aktiv, onvalue="x", offvalue="")
-        edit_aktiv.grid(row=1, column=0)
-        edit_firma = tk.Entry(edit_frame, textvariable=self.firma)
-        edit_firma.grid(row=1, column=1)
-        edit_name = tk.Entry(edit_frame, textvariable=self.name)
-        edit_name.grid(row=1, column=2)
-        edit_strasse = tk.Entry(edit_frame, textvariable=self.strasse)
-        edit_strasse.grid(row=1, column=3)
-        edit_plz_ort = tk.Entry(edit_frame, textvariable=self.plz_ort)
-        edit_plz_ort.grid(row=1, column=4)
-        tk.Button(edit_frame, text="Update", command=self.update_record, width=button_width).grid(row=1, column=5)
-        tk.Button(edit_frame, text="Toggle Aktiv", command=self.toggle_active, width=button_width).grid(row=1, column=6)
 
         data_frame = tk.Frame(self.root, bg="teal")
         data_frame.pack(side=tk.TOP, fill=tk.BOTH, expand=True)