diff --git a/iridium_installer/ui/window.py b/iridium_installer/ui/window.py
index fbf5cfe..a03b491 100644
--- a/iridium_installer/ui/window.py
+++ b/iridium_installer/ui/window.py
@@ -18,45 +18,44 @@ class InstallerWindow(Adw.ApplicationWindow):
         self.set_default_size(900, 650)
         self.set_title("Iridium Installer")
 
-        # Main Layout
-        main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
-        self.set_content(main_box)
+        self.toolbar_view = Adw.ToolbarView()
+        self.set_content(self.toolbar_view)
 
-        # Header Bar
-        header = Adw.HeaderBar()
-        main_box.append(header)
+        # Header Bar (Top)
+        self.header_bar = Adw.HeaderBar()
+        self.toolbar_view.add_top_bar(self.header_bar)
 
         # Content Stack
         self.stack = Adw.ViewStack()
         self.stack.set_vexpand(True)
-        main_box.append(self.stack)
+        self.toolbar_view.set_content(self.stack)
 
         # Navigation Bar (Bottom)
-        nav_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
-        nav_box.add_css_class("toolbar")
-        nav_box.set_margin_top(12)
-        nav_box.set_margin_bottom(12)
-        nav_box.set_margin_start(12)
-        nav_box.set_margin_end(12)
-        nav_box.set_spacing(12)
-        main_box.append(nav_box)
+        self.bottom_bar = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+        self.bottom_bar.add_css_class("toolbar")
+        self.bottom_bar.set_margin_top(12)
+        self.bottom_bar.set_margin_bottom(12)
+        self.bottom_bar.set_margin_start(12)
+        self.bottom_bar.set_margin_end(12)
+        self.bottom_bar.set_spacing(12)
+        self.toolbar_view.add_bottom_bar(self.bottom_bar)
 
         # Back Button
         self.back_button = Gtk.Button(label="Back")
         self.back_button.connect("clicked", self.on_back_clicked)
         self.back_button.set_sensitive(False)
-        nav_box.append(self.back_button)
+        self.bottom_bar.append(self.back_button)
 
         # Spacer to push Next button to the right
         spacer = Gtk.Label()
         spacer.set_hexpand(True)
-        nav_box.append(spacer)
+        self.bottom_bar.append(spacer)
 
         # Next Button
         self.next_button = Gtk.Button(label="Next")
         self.next_button.add_css_class("suggested-action")
         self.next_button.connect("clicked", self.on_next_clicked)
-        nav_box.append(self.next_button)
+        self.bottom_bar.append(self.next_button)
 
         # Page Management
         self.page_ids = []