diff --git a/src/frontend/templates/mod.rs b/src/frontend/templates/mod.rs
index 542f42d..1c8f764 100644
--- a/src/frontend/templates/mod.rs
+++ b/src/frontend/templates/mod.rs
@@ -117,21 +117,23 @@ pub fn base(config: TemplateConfig, content: Markup) -> Markup {
                 (navbar(&config))
 
                 main .container.my-4 {
-                    div .d-flex.justify-content-between.mb-3 {
+                    div {
+                        div .float-end.d-flex.align-items-start.h-100.gap-1 {
+                            @for page_action in config.page_actions {
+                                (page_action)
+                            }
+                        }
                         div .d-flex.align-items-center.gap-1 {
                             @if let Some(ref page_title) = config.page_title {
                                 h2 {
                                     (page_title)
+
+                                    @if let Some(ref page_title_extra) = config.page_title_extra {
+                                        " "
+                                        (page_title_extra)
+                                    }
                                 }
                             }
-                            @if let Some(ref page_title_extra) = config.page_title_extra {
-                                (page_title_extra)
-                            }
-                        }
-                        div .d-flex.h-100.gap-1 {
-                            @for page_action in config.page_actions {
-                                (page_action)
-                            }
                         }
                     }