diff --git a/resources/js/components/page/Header.vue b/resources/js/components/page/Header.vue
index e7f8ed18..c12f3da1 100644
--- a/resources/js/components/page/Header.vue
+++ b/resources/js/components/page/Header.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="h-16 px-6 flex justify-between items-center border-b border-solid border-gray-600 group-[.is-bright]:border-gray-500">
+    <div class="h-16 px-6 flex items-center border-b border-solid border-gray-600 group-[.is-bright]:border-gray-500">
         <slot name="before-title"></slot>
-        <div class="flex items-center">
+        <div class="flex items-center grow">
             <page-title class="mr-2">{{ title }}</page-title>
             <slot name="toolbar"></slot>
         </div>
diff --git a/resources/js/components/page/Layout.vue b/resources/js/components/page/Layout.vue
index 5ef00baf..6d8bcdea 100644
--- a/resources/js/components/page/Layout.vue
+++ b/resources/js/components/page/Layout.vue
@@ -1,18 +1,18 @@
 <template>
     <div class="grow bg-gray-900 flex flex-col transition-all" :class="{'ml-56': menuStore.visible, 'ml-0': !menuStore.visible}">
-        <div class="h-16 px-6 flex justify-between items-center border-b border-solid border-gray-600 group-[.is-bright]:border-gray-500">
-            <a href="#" @click.prevent="menuStore.toggle()" class="lg:hidden mr-2">
-                <svg-sprite src="menu" class="text-gray-100 w-5 h-5"></svg-sprite>
-            </a>
-            <div class="flex items-center">
-                <page-title class="mr-2">{{ $page.props.title }}</page-title>
+        <page-header :title="$page.props.title">
+            <div slot="before-title" class="flex items-center">
+                <a href="#" @click.prevent="menuStore.toggle()" class="lg:hidden mr-2">
+                    <svg-sprite src="menu" class="text-gray-100 w-5 h-5"></svg-sprite>
+                </a>
+            </div>
+            <div class="flex" slot="toolbar">
                 <slot name="toolbar"></slot>
             </div>
-            <div class="flex grow justify-between">
-                <portal-target name="toolbar-left"> </portal-target>
+            <div slot="right">
                 <portal-target name="toolbar-right"> </portal-target>
             </div>
-        </div>
+        </page-header>
 
         <div :class="pageClass" class="grow flex flex-col">
             <slot></slot>