diff --git a/paket/src/account.rs b/paket/src/account.rs
index d314bb6..40dafff 100644
--- a/paket/src/account.rs
+++ b/paket/src/account.rs
@@ -77,8 +77,8 @@ impl Component for AccountView {
                         set_margin_start: 12,
                         set_margin_end: 12,
 
-                        set_margin_top: 24,
-                        set_margin_bottom: 24,
+                        set_margin_top: 12,
+                        set_margin_bottom: 12,
 
                         // General infos
                         append = &adw::PreferencesGroup {
diff --git a/paket/src/tracking.rs b/paket/src/tracking.rs
index 1996a13..72d0106 100644
--- a/paket/src/tracking.rs
+++ b/paket/src/tracking.rs
@@ -41,33 +41,48 @@ impl Component for TrackingView {
         adw::ToastOverlay {
             #[wrap(Some)]
             set_child = &gtk::ScrolledWindow {
+                set_propagate_natural_width: true,
                 #[wrap(Some)]
-                set_child = &gtk::Box {
-                    set_orientation: gtk::Orientation::Vertical,
+                set_child = &adw::Clamp {
+                    set_maximum_size: 1800,
 
-                    gtk::Box {
-                        set_orientation: gtk::Orientation::Horizontal,
-                        set_margin_all: 2,
-                        add_css_class: relm4::css::TOOLBAR,
+                    #[wrap(Some)]
+                    set_child = &gtk::Box {
+                        set_orientation: gtk::Orientation::Vertical,
+                        set_margin_start: 6,
+                        set_margin_end: 6,
+
+                        set_margin_bottom: 12,
+
+                        adw::Clamp {
+                            #[wrap(Some)]
+                            set_child = &gtk::Box {
+                                set_orientation: gtk::Orientation::Horizontal,
+                                set_margin_all: 2,
+                                set_halign: gtk::Align::Center,
+
+                                add_css_class: relm4::css::TOOLBAR,
+
+                                #[name = "tracking_entry"]
+                                gtk::Entry {
+                                    set_input_hints: gtk::InputHints::PRIVATE,
+                                    set_hexpand: true,
+                                },
+
+                                #[name = "tracking_entry_button"]
+                                gtk::Button {
+                                    set_icon_name: relm4_icons::icon_names::LOUPE_LARGE
+                                }
+                            },
 
-                        #[name = "tracking_entry"]
-                        gtk::Entry {
-                            set_input_hints: gtk::InputHints::PRIVATE,
-                            set_hexpand: true,
                         },
 
-                        #[name = "tracking_entry_button"]
-                        gtk::Button {
-                            set_icon_name: relm4_icons::icon_names::LOUPE_LARGE
-                        }
-                    },
-
-
-                    #[local_ref]
-                    tracking_box -> gtk::Box {
-                        set_spacing: 8
-                    },
-                }
+                        #[local_ref]
+                        tracking_box -> gtk::Box {
+                            set_spacing: 8
+                        },
+                    }
+                },
 
             }
         }
@@ -273,6 +288,7 @@ impl FactoryComponent for ShipmentView {
                     gtk::Label {
                         add_css_class: relm4::css::HEADING,
                         set_halign: gtk::Align::Start,
+                        set_wrap: true,
 
                         set_label: {
                             // TODO: gettext