diff --git a/src/popular_remotes.blp b/src/popular_remotes.blp
index b7aabd6..f5bd1f3 100644
--- a/src/popular_remotes.blp
+++ b/src/popular_remotes.blp
@@ -3,67 +3,38 @@ using Adw 1;
 
 template PopularRemotesWindow : Adw.Window {
     default-width: 450;
-    default-height: 550;
-    title: _("Add a Remote");
+    default-height: 613;
+    title: "";
 
     Adw.ToolbarView main_toolbar_view {
         [top]
         HeaderBar header_bar {
-            // [start]
-            // Button refresh_button {
-            //     icon-name: "view-refresh-symbolic";
-            //     tooltip-text: _("Refresh the List of Installed Apps");
-            // }
         }
         content:
         Adw.ToastOverlay toast_overlay {
-          Stack main_stack {
-            Box main_box {
-                orientation: vertical;
-                Overlay main_overlay {
-                    ScrolledWindow scrolled_window {
-                        vexpand: true;
-                        Adw.Clamp{
-                            Box {
-                                orientation: vertical;
-                                Label {
-                                    label: _("Choose from a list of popular remotes");
-                                    halign: start;
-                                    margin-start: 12;
-                                    margin-bottom: 3;
-                                    styles["title-4"]
-                                }
-                                ListBox list_of_remotes {
-                                    margin-top: 6;
-                                    margin-bottom: 6;
-                                    margin-start: 12;
-                                    margin-end: 12;
-                                    hexpand: true;
-                                    valign: start;
-                                    selection-mode: none;
-                                    styles["boxed-list"]
-                                }
-                                ListBox custom_list {
-                                    margin-top: 6;
-                                    margin-bottom: 6;
-                                    margin-start: 12;
-                                    margin-end: 12;
-                                    hexpand: true;
-                                    valign: start;
-                                    selection-mode: none;
-                                    styles["boxed-list"]
-                                }
-                            }
+            vexpand: true;
+            Adw.StatusPage {
+                valign: start;
+                title: _("Add a Remote");
+                description: _("Choose from a list of popular remotes.");
+                Adw.Clamp {
+                    Box {
+                        orientation: vertical;
+                        ListBox list_of_remotes {
+                            hexpand: true;
+                            valign: start;
+                            selection-mode: none;
+                            styles["boxed-list"]
+                        }
+                        ListBox custom_list {
+                            hexpand: true;
+                            valign: start;
+                            selection-mode: none;
+                            styles["boxed-list"]
                         }
                     }
                 }
             }
-            Adw.StatusPage no_data {
-              icon-name: "check-plain-symbolic";
-              title: _("No Leftover Data");
-              description: _("There is no leftover user data");
-            }
-          }
         };
     }
 }
\ No newline at end of file
diff --git a/src/popular_remotes_window.py b/src/popular_remotes_window.py
index a7c571b..69d2aef 100644
--- a/src/popular_remotes_window.py
+++ b/src/popular_remotes_window.py
@@ -174,6 +174,7 @@ class PopularRemotesWindow(Adw.Window):
         super().__init__(**kwargs)
         self.my_utils = myUtils(self)
         self.parent_window = parent_window
+        self.set_size_request(260, 230)
 
         self.new_env = dict( os.environ ) 
         self.new_env['LC_ALL'] = 'C'