diff --git a/cfd_ui_setup.py b/cfd_ui_setup.py
index 67190e8..f52152d 100644
--- a/cfd_ui_setup.py
+++ b/cfd_ui_setup.py
@@ -116,7 +116,88 @@ class WidgetManager:
         self.setup_widgets()
 
     def _setup_top_bar(self, parent_frame):
-        # ... (implementation from previous step)
+        top_bar = ttk.Frame(parent_frame, style='Accent.TFrame', padding=(0, 5, 0, 5))
+        top_bar.grid(row=0, column=0, columnspan=2, sticky="ew")
+        top_bar.grid_columnconfigure(1, weight=1)
+
+        # Left navigation
+        left_nav_container = ttk.Frame(top_bar, style='Accent.TFrame')
+        left_nav_container.grid(row=0, column=0, sticky="w")
+        left_nav_container.grid_propagate(False)
+
+        self.back_button = ttk.Button(left_nav_container, image=self.dialog.icon_manager.get_icon(
+            'back'), command=self.dialog.go_back, state=tk.DISABLED, style="Header.TButton.Borderless.Round")
+        self.back_button.pack(side="left", padx=(10, 5))
+        Tooltip(self.back_button, "Zurück")
+
+        self.forward_button = ttk.Button(left_nav_container, image=self.dialog.icon_manager.get_icon(
+            'forward'), command=self.dialog.go_forward, state=tk.DISABLED, style="Header.TButton.Borderless.Round")
+        self.forward_button.pack(side="left", padx=5)
+        Tooltip(self.forward_button, "Vorwärts")
+
+        self.up_button = ttk.Button(left_nav_container, image=self.dialog.icon_manager.get_icon(
+            'up'), command=self.dialog.go_up_level, style="Header.TButton.Borderless.Round")
+        self.up_button.pack(side="left", padx=5)
+        Tooltip(self.up_button, "Eine Ebene höher")
+
+        self.home_button = ttk.Button(left_nav_container, image=self.dialog.icon_manager.get_icon(
+            'home'), command=lambda: self.dialog.navigate_to(os.path.expanduser("~")), style="Header.TButton.Borderless.Round")
+        self.home_button.pack(side="left", padx=(5, 10))
+        Tooltip(self.home_button, "Home")
+
+        # Path and search
+        path_search_container = ttk.Frame(top_bar, style='Accent.TFrame')
+        path_search_container.grid(row=0, column=1, sticky="ew")
+        self.path_entry = ttk.Entry(path_search_container)
+        self.path_entry.bind("<Return>", lambda e: self.dialog.navigate_to(self.path_entry.get()))
+
+        search_icon_pos = self.settings.get("search_icon_pos", "left")
+        if search_icon_pos == 'left':
+            path_search_container.grid_columnconfigure(1, weight=1)
+            self.path_entry.grid(row=0, column=1, sticky="ew")
+        else: # right
+            path_search_container.grid_columnconfigure(0, weight=1)
+            self.path_entry.grid(row=0, column=0, sticky="ew")
+
+        # Right controls
+        right_controls_container = ttk.Frame(top_bar, style='Accent.TFrame')
+        right_controls_container.grid(row=0, column=2, sticky="e")
+        self.responsive_buttons_container = ttk.Frame(right_controls_container, style='Accent.TFrame')
+        self.responsive_buttons_container.pack(side="left")
+
+        self.new_folder_button = ttk.Button(self.responsive_buttons_container, image=self.dialog.icon_manager.get_icon(
+            'new_folder_small'), command=self.dialog.create_new_folder, style="Header.TButton.Borderless.Round")
+        self.new_folder_button.pack(side="left", padx=5)
+        Tooltip(self.new_folder_button, "Neuen Ordner erstellen")
+
+        self.new_file_button = ttk.Button(self.responsive_buttons_container, image=self.dialog.icon_manager.get_icon(
+            'new_document_small'), command=self.dialog.create_new_file, style="Header.TButton.Borderless.Round")
+        self.new_file_button.pack(side="left", padx=5)
+        Tooltip(self.new_file_button, "Neues Dokument erstellen")
+
+        if self.dialog.dialog_mode == "open":
+            self.new_folder_button.config(state=tk.DISABLED)
+            self.new_file_button.config(state=tk.DISABLED)
+
+        self.view_switch = ttk.Frame(self.responsive_buttons_container, padding=(5, 0), style='Accent.TFrame')
+        self.view_switch.pack(side="left")
+        self.icon_view_button = ttk.Button(self.view_switch, image=self.dialog.icon_manager.get_icon(
+            'icon_view'), command=self.dialog.set_icon_view, style="Header.TButton.Active.Round")
+        self.icon_view_button.pack(side="left", padx=5)
+        Tooltip(self.icon_view_button, "Kachelansicht")
+
+        self.list_view_button = ttk.Button(self.view_switch, image=self.dialog.icon_manager.get_icon(
+            'list_view'), command=self.dialog.set_list_view, style="Header.TButton.Borderless.Round")
+        self.list_view_button.pack(side="left")
+        Tooltip(self.list_view_button, "Listenansicht")
+
+        self.hidden_files_button = ttk.Button(self.responsive_buttons_container, image=self.dialog.icon_manager.get_icon(
+            'hide'), command=self.dialog.toggle_hidden_files, style="Header.TButton.Borderless.Round")
+        self.hidden_files_button.pack(side="left", padx=10)
+        Tooltip(self.hidden_files_button, "Versteckte Dateien anzeigen")
+
+        self.more_button = ttk.Button(right_controls_container, text="...",
+                                      command=self.dialog.show_more_menu, style="Header.TButton.Borderless.Round", width=3)
 
     def _setup_sidebar(self, parent_paned_window):
         sidebar_frame = ttk.Frame(parent_paned_window, style="Sidebar.TFrame", padding=(0, 0, 0, 0), width=200)
@@ -125,18 +206,7 @@ class WidgetManager:
         parent_paned_window.add(sidebar_frame, weight=0)
         sidebar_frame.grid_rowconfigure(2, weight=1)
 
-        self._setup_sidebar_bookmarks(sidebar_frame)
-
-        separator_color = "#a9a9a9" if self.style_manager.is_dark else "#7c7c7c"
-        tk.Frame(sidebar_frame, height=1, bg=separator_color).grid(row=1, column=0, sticky="ew", padx=20, pady=15)
-
-        self._setup_sidebar_devices(sidebar_frame)
-
-        tk.Frame(sidebar_frame, height=1, bg=separator_color).grid(row=3, column=0, sticky="ew", padx=20, pady=15)
-
-        self._setup_sidebar_storage(sidebar_frame)
-
-    def _setup_sidebar_bookmarks(self, sidebar_frame):
+        # Sidebar buttons (Bookmarks)
         sidebar_buttons_frame = ttk.Frame(sidebar_frame, style="Sidebar.TFrame", padding=(0, 15, 0, 0))
         sidebar_buttons_frame.grid(row=0, column=0, sticky="nsew")
         sidebar_buttons_config = [
@@ -154,7 +224,10 @@ class WidgetManager:
             btn.pack(fill="x", pady=1)
             self.sidebar_buttons.append((btn, f" {config['name']}"))
 
-    def _setup_sidebar_devices(self, sidebar_frame):
+        separator_color = "#a9a9a9" if self.style_manager.is_dark else "#7c7c7c"
+        tk.Frame(sidebar_frame, height=1, bg=separator_color).grid(row=1, column=0, sticky="ew", padx=20, pady=15)
+
+        # Mounted devices
         mounted_devices_frame = ttk.Frame(sidebar_frame, style="Sidebar.TFrame")
         mounted_devices_frame.grid(row=2, column=0, sticky="nsew", padx=10)
         mounted_devices_frame.grid_columnconfigure(0, weight=1)
@@ -162,7 +235,9 @@ class WidgetManager:
                   foreground=self.style_manager.color_foreground).grid(row=0, column=0, sticky="ew", padx=10, pady=(5, 0))
         # ... (rest of the device setup logic)
 
-    def _setup_sidebar_storage(self, sidebar_frame):
+        tk.Frame(sidebar_frame, height=1, bg=separator_color).grid(row=3, column=0, sticky="ew", padx=20, pady=15)
+
+        # Storage info
         storage_frame = ttk.Frame(sidebar_frame, style="Sidebar.TFrame")
         storage_frame.grid(row=5, column=0, sticky="sew", padx=10, pady=10)
         self.storage_label = ttk.Label(storage_frame, text="Freier Speicher:", background=self.style_manager.freespace_background)
@@ -171,9 +246,98 @@ class WidgetManager:
         self.storage_bar.pack(fill="x", pady=(2, 5), padx=15)
 
     def _setup_bottom_bar(self):
-        # ... (implementation from previous step)
+        """Sets up the bottom bar including containers and widgets based on dialog mode."""
+        self.action_status_frame = ttk.Frame(self.content_frame, style="AccentBottom.TFrame")
+        self.action_status_frame.grid(row=1, column=0, sticky="ew", pady=(5, 10), padx=10)
 
-    # ... (layout methods for bottom bar)
+        self.left_container = ttk.Frame(self.action_status_frame, style="AccentBottom.TFrame")
+        self.center_container = ttk.Frame(self.action_status_frame, style="AccentBottom.TFrame")
+        self.right_container = ttk.Frame(self.action_status_frame, style="AccentBottom.TFrame")
+
+        self.action_status_frame.grid_columnconfigure(1, weight=1)
+        self.left_container.grid(row=0, column=0, sticky='w')
+        self.center_container.grid(row=0, column=1, sticky='ew')
+        self.right_container.grid(row=0, column=2, sticky='e')
+
+        # --- Define Widgets ---
+        self.status_bar = ttk.Label(self.center_container, text="", anchor="w", style="AccentBottom.TLabel")
+        self.search_entry = ttk.Entry(self.center_container)
+        self.search_status_label = ttk.Label(self.center_container, text="", style="AccentBottom.TLabel")
+        self.settings_button = ttk.Button(self.action_status_frame, image=self.dialog.icon_manager.get_icon('settings-2_small'),
+                                          command=self.dialog.open_settings_dialog, style="Bottom.TButton.Borderless.Round")
+        self.trash_button = ttk.Button(self.action_status_frame, image=self.dialog.icon_manager.get_icon('trash_small2'),
+                                       command=self.dialog.delete_selected_item, style="Bottom.TButton.Borderless.Round")
+        Tooltip(self.trash_button, "Ausgewähltes Element löschen/verschieben")
+
+        button_box_pos = self.settings.get("button_box_pos", "left")
+
+        if self.dialog.dialog_mode == "save":
+            self.filename_entry = ttk.Entry(self.center_container)
+            self.save_button = ttk.Button(self.action_status_frame, text="Speichern", command=self.dialog.on_save)
+            self.cancel_button = ttk.Button(self.action_status_frame, text="Abbrechen", command=self.dialog.on_cancel)
+            self.filter_combobox = ttk.Combobox(self.center_container, values=[ft[0] for ft in self.dialog.filetypes], state="readonly")
+            self.filter_combobox.bind("<<ComboboxSelected>>", self.dialog.on_filter_change)
+            self.filter_combobox.set(self.dialog.filetypes[0][0])
+
+            self.filename_entry.pack(side="top", fill="x", expand=True)
+
+            if button_box_pos == 'left':
+                self._layout_save_buttons_left()
+            else:
+                self._layout_save_buttons_right()
+        else:  # Open mode
+            self.open_button = ttk.Button(self.action_status_frame, text="Öffnen", command=self.dialog.on_open)
+            self.cancel_button = ttk.Button(self.action_status_frame, text="Abbrechen", command=self.dialog.on_cancel)
+            self.filter_combobox = ttk.Combobox(self.center_container, values=[ft[0] for ft in self.dialog.filetypes], state="readonly")
+            self.filter_combobox.bind("<<ComboboxSelected>>", self.dialog.on_filter_change)
+            self.filter_combobox.set(self.dialog.filetypes[0][0])
+
+            self.status_bar.pack(side="top", fill="x")
+            self.search_entry.pack(side="top", fill="x")
+            self.search_entry.pack_forget()
+
+            if button_box_pos == 'left':
+                self._layout_open_buttons_left()
+            else:
+                self._layout_open_buttons_right()
+
+    def _layout_save_buttons_left(self):
+        self.save_button.pack(in_=self.left_container, side="left", padx=(0, 5))
+        self.cancel_button.pack(in_=self.left_container, side="left")
+        self.filter_combobox.pack(in_=self.center_container, side="left", pady=(5,0), padx=(5,0))
+        self.search_status_label.pack(in_=self.center_container, side="left", pady=(5,0), padx=(5,0))
+        self.trash_button.pack(in_=self.right_container, side="right", padx=(5,0))
+        self.settings_button.pack(in_=self.right_container, side="right")
+
+    def _layout_save_buttons_right(self):
+        self.trash_button.pack(in_=self.left_container, side="left")
+        self.search_status_label.pack(in_=self.center_container, side="left", pady=(5,0), padx=(5,0))
+        self.filter_combobox.pack(in_=self.center_container, side="right", pady=(5,0), padx=(0,5))
+        self.save_button.pack(in_=self.right_container, side="left", padx=(5, 5))
+        self.cancel_button.pack(in_=self.right_container, side="left")
+        self.settings_button.pack(in_=self.right_container, side="right")
+
+    def _layout_open_buttons_left(self):
+        self.open_button.pack(in_=self.left_container, side="left", padx=(0, 5))
+        self.cancel_button.pack(in_=self.left_container, side="left")
+        self.filter_combobox.pack(in_=self.center_container, side="left", pady=(5,0), padx=(5,0))
+        self.search_status_label.pack(in_=self.center_container, side="left", pady=(5,0), padx=(5,0))
+        self.settings_button.pack(in_=self.right_container, side="right")
+
+    def _layout_open_buttons_right(self):
+        # Corrected layout: search status left, filter combobox right
+        self.search_status_label.pack(in_=self.center_container, side="left", pady=(5,0), padx=(5,0))
+        self.filter_combobox.pack(in_=self.center_container, side="right", pady=(5,0), padx=(0,5))
+
+        # Corrected button layout
+        self.trash_button.pack(in_=self.left_container, side="bottom", pady=(0, 5))
+
+        action_button_frame = ttk.Frame(self.right_container, style="AccentBottom.TFrame")
+        action_button_frame.pack(side="bottom", anchor="se")
+
+        self.open_button.pack(in_=action_button_frame, side="left", padx=(0, 5))
+        self.cancel_button.pack(in_=action_button_frame, side="left")
+        self.settings_button.pack(in_=self.right_container, side="top", anchor="ne", pady=(0,5))
 
     def setup_widgets(self):
         # Main container