Change up timezone and keyboard ui a bit

src/pages/keyboard_screen.blp

@@ -15,36 +15,45 @@ template KeyboardScreen : Adw.Bin {
                 title: "Next question: keyboard layout?";
                 description: "What is it? Huh?";
             Adw.PreferencesPage {
-                Adw.Carousel keyboard_carousel {
+                Adw.PreferencesGroup {
-                    orientation: horizontal;
-                    vexpand: true;
                     hexpand: true;
-                    Adw.PreferencesGroup keyboard_layouts {
+                    margin-end: 20;
+                    margin-start: 20;
+                    Adw.Carousel keyboard_carousel {
+                        orientation: horizontal;
+                        vexpand: true;
                         hexpand: true;
-                        margin-end: 20;
+                        Gtk.Box keyboard_layouts {
-                        margin-start: 20;
+                            margin-end: 1;
-                        Gtk.ListBox list_keyboard_layouts {
+                            margin-start: 1;
+                            orientation: vertical;
+                            hexpand: true;
                             Gtk.Box layout_search {
-					            Gtk.SearchEntry layout_entry_search {
+                                margin-bottom: 5;
-						            hexpand: true;
+                                Gtk.SearchEntry layout_entry_search {
-						            placeholder-text: _("Search for a keyboard layout");
+                                    hexpand: true;
-					            }
+                                    placeholder-text: _("Search for a keyboard layout");
-				            }
+                                }
-                            styles ["boxed-list"]
+                            }
+                            Gtk.ListBox list_keyboard_layouts {
+                                styles ["boxed-list"]
+                            }
                         }
-                    }
+                        Gtk.Box keyboard_variants {
-                    Adw.PreferencesGroup keyboard_variants {
+                            margin-start: 1;
-                        hexpand: true;
+                            margin-end: 1;
-                        margin-end: 20;
+                            hexpand: true;
-                        margin-start: 20;
+                            orientation: vertical;
-                        Gtk.ListBox list_keyboard_variants {
                             Gtk.Box variant_search {
-					            Gtk.SearchEntry variant_entry_search {
+                                margin-bottom: 5;
-						            hexpand: true;
+                                Gtk.SearchEntry variant_entry_search {
-						            placeholder-text: _("Search for a keyboard variant");
+                                    hexpand: true;
-					            }
+                                    placeholder-text: _("Search for a keyboard variant");
-				            }
+                                }
-                            styles ["boxed-list"]
+                            }
+                            Gtk.ListBox list_keyboard_variants {
+                                styles ["boxed-list"]
+                            }
                         }
                     }
                 }

src/pages/timezone_screen.blp

@@ -14,15 +14,18 @@ template TimezoneScreen : Adw.Bin {
             description: "What's your curent timezone?";
             Gtk.Box {
                 orientation: vertical;
+                Gtk.Box timezone_search {
+					        Gtk.SearchEntry timezone_entry_search {
+						        hexpand: true;
+						        //margin-bottom: 5;
+						        margin-end: 30;
+						        margin-start: 30;
+						        placeholder-text: _("Search for a timezone");
+					        }
+				        }
                 Adw.PreferencesPage {
                     Adw.PreferencesGroup {
                         Gtk.ListBox list_timezones {
-                            Gtk.Box timezone_search {
-					            Gtk.SearchEntry timezone_entry_search {
-						            hexpand: true;
-						            placeholder-text: _("Search for a timezone");
-					            }
-				            }
                             styles ["boxed-list"]
                         }
                     }