diff --git a/__pycache__/cfd_ui_setup.cpython-312.pyc b/__pycache__/cfd_ui_setup.cpython-312.pyc
index 245ded2..fd15efe 100644
Binary files a/__pycache__/cfd_ui_setup.cpython-312.pyc and b/__pycache__/cfd_ui_setup.cpython-312.pyc differ
diff --git a/cfd_ui_setup.py b/cfd_ui_setup.py
index ece4360..7f0dce1 100644
--- a/cfd_ui_setup.py
+++ b/cfd_ui_setup.py
@@ -388,7 +388,7 @@ class WidgetManager:
 
             self.center_container.grid_rowconfigure(0, weight=1)
             self.status_bar.grid(row=0, column=0, columnspan=2, sticky="ew")
-            self.search_entry.grid(row=1, column=0, columnspan=2, sticky="ew")
+            self.search_entry.grid(row=0, column=0, columnspan=2, sticky="ew")
             self.search_entry.grid_forget()
 
             if button_box_pos == 'left':
@@ -414,7 +414,7 @@ class WidgetManager:
         self.left_container.grid_rowconfigure(0, weight=1)
         self.save_button.grid(in_=self.right_container, row=0, column=0, pady=(0, 5))
         self.cancel_button.grid(in_=self.right_container, row=1, column=0)
-        self.settings_button.grid(in_=self.right_container, row=0, column=1, sticky="se", padx=(5,0))
+        self.settings_button.grid(in_=self.right_container, row=0, column=1, sticky="ne", padx=(5,0))
 
         self.left_container.grid_rowconfigure(0, weight=1)
         self.trash_button.grid(in_=self.left_container, row=0, column=0, sticky="sw")
@@ -430,7 +430,7 @@ class WidgetManager:
         self.cancel_button.grid(in_=self.left_container, row=1, column=0)
 
         self.center_container.grid_columnconfigure(0, weight=1)
-        self.filter_combobox.grid(in_=self.center_container, row=0, column=0, sticky="e", pady=(5,0), padx=(5,0))
+        self.filter_combobox.grid(in_=self.center_container, row=1, column=0, sticky="w", pady=(5,0))
         self.search_status_label.grid(row=0, column=1, sticky="w", pady=(5,0), padx=(5,0))
 
         self.right_container.grid_rowconfigure(0, weight=1)
@@ -438,16 +438,18 @@ class WidgetManager:
 
     def _layout_open_buttons_right(self):
         self.right_container.grid_rowconfigure(0, weight=1)
-        self.open_button.grid(in_=self.right_container, row=0, column=1, pady=(0, 5))
-        self.cancel_button.grid(in_=self.right_container, row=1, column=1)
-        self.settings_button.grid(in_=self.right_container, row=0, column=0, sticky="ne", pady=(0,5))
-
-        self.center_container.grid_columnconfigure(1, weight=1)
-        self.search_status_label.grid(row=0, column=0, sticky="w", pady=(5,0), padx=(5,0))
-        self.filter_combobox.grid(in_=self.center_container, row=0, column=1, sticky="e", pady=(5,0), padx=(0,5))
+        self.open_button.grid(in_=self.right_container, row=0, column=0, pady=(0, 5))
+        self.cancel_button.grid(in_=self.right_container, row=1, column=0)
+        self.settings_button.grid(in_=self.right_container, row=0, column=1, sticky="ne", padx=(5,0))
 
         self.left_container.grid_rowconfigure(0, weight=1)
-        self.trash_button.grid(in_=self.left_container, row=0, column=0, sticky="sw", pady=(0, 5))
+        self.trash_button.grid(in_=self.left_container, row=0, column=0, sticky="sw")
+
+        self.center_container.grid_columnconfigure(1, weight=1)
+        self.filter_combobox.grid(in_=self.center_container, row=1, column=1, sticky="e", pady=(5,0))      
+        self.search_status_label.grid(row=0, column=0, sticky="w", pady=(5,0), padx=(5,0))
+
+
 
     def setup_widgets(self):
         # Main container
diff --git a/mainwindow.py b/mainwindow.py
index c7d103a..690e400 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -33,7 +33,7 @@ class GlotzMol(tk.Tk):
         dialog = CustomFileDialog(self,
                                   initial_dir=os.path.expanduser("~"),
                                   filetypes=[("All Files", "*.*")
-                                             ])
+                                             ], dialog_mode="save")
 
         # This is the crucial part: wait for the dialog to be closed
         self.wait_window(dialog)