diff --git a/core/static/bundled/user/family-graph-index.ts b/core/static/bundled/user/family-graph-index.ts
index 058d0cbe..b17c7420 100644
--- a/core/static/bundled/user/family-graph-index.ts
+++ b/core/static/bundled/user/family-graph-index.ts
@@ -287,6 +287,7 @@ document.addEventListener("alpine:init", () => {
         config.activeUser,
       );
       this.graph.userZoomingEnabled(this.isZoomEnabled);
+      this.$refs.graph.prepend(this.$refs.zoomControl);
       this.loading = false;
     },
   }));
diff --git a/core/static/user/user_godfathers.scss b/core/static/user/user_godfathers.scss
index 9764ee3e..d350125f 100644
--- a/core/static/user/user_godfathers.scss
+++ b/core/static/user/user_godfathers.scss
@@ -2,6 +2,12 @@
   width: 100%;
   height: 70vh;
   display: block;
+  overflow: clip;
+}
+
+.zoom-control {
+  float: right;
+  margin-right: 10px;
 }
 
 .graph-toolbar {
@@ -12,7 +18,7 @@
   justify-content: space-around;
   gap: 30px;
 
-  .toolbar-column{
+  .toolbar-column {
     display: flex;
     flex-direction: column;
     gap: 20px;
@@ -34,31 +40,38 @@
 
     .depth-choice {
       white-space: nowrap;
+
       input[type="number"] {
         -webkit-appearance: textfield;
         -moz-appearance: textfield;
         appearance: textfield;
+
         &::-webkit-inner-spin-button,
         &::-webkit-outer-spin-button {
           -webkit-appearance: none;
         }
       }
+
       button {
         background: none;
-        & > .fa {
+
+        &>.fa {
           border-radius: 50%;
           font-size: 12px;
           padding: 5px;
         }
-        &:enabled > .fa {
+
+        &:enabled>.fa {
           background-color: #354a5f;
           color: white;
         }
-        &:enabled:hover > .fa {
+
+        &:enabled:hover>.fa {
           color: white;
           background-color: #35405f; // just a bit darker
         }
-        &:disabled > .fa {
+
+        &:disabled>.fa {
           background-color: gray;
           color: white;
         }
@@ -74,6 +87,7 @@
   @media screen and (max-width: 500px) {
     flex-direction: column;
     gap: 20px;
+
     .toolbar-column {
       min-width: 100%;
     }
@@ -87,14 +101,16 @@
   padding: 10px;
   box-sizing: border-box;
 
-  > form {
+  >form {
     margin: 0;
   }
 }
+
 #family-tree-link {
   display: inline-block;
   margin-top: 10px;
   text-align: center;
+
   @media (min-width: 450px) {
     margin-right: auto;
   }
@@ -122,10 +138,10 @@
     width: 100%;
   }
 
-  > div.mini_profile_link {
+  >div.mini_profile_link {
     position: relative;
 
-    > a {
+    >a {
       &.mini_profile_link {
         display: flex;
         flex-direction: column;
@@ -140,7 +156,7 @@
           max-height: 65px;
         }
 
-        > span {
+        >span {
           height: 150px;
           width: 100%;
 
@@ -149,7 +165,7 @@
             width: 80px;
           }
 
-          > img {
+          >img {
             width: 100%;
             max-width: 100%;
             max-height: 100%;
@@ -163,7 +179,7 @@
           }
         }
 
-        > em {
+        >em {
           box-sizing: border-box;
           padding: 0 5px;
           text-align: center;
@@ -195,7 +211,7 @@
     }
   }
 
-  > a.mini_profile_link {
+  >a.mini_profile_link {
     display: none;
   }
 }
\ No newline at end of file
diff --git a/core/templates/core/user_godfathers_tree.jinja b/core/templates/core/user_godfathers_tree.jinja
index 92d54772..1e3e0812 100644
--- a/core/templates/core/user_godfathers_tree.jinja
+++ b/core/templates/core/user_godfathers_tree.jinja
@@ -77,7 +77,6 @@
               ></i></button>
           </span>
         </div>
-
       </div>
 
       <div class="toolbar-column">
@@ -92,33 +91,34 @@
           <i class="fa fa-camera"></i>
           {% trans %}Save{% endtrans %}
         </button>
-
-        <div class="toolbar-input">
-          <button
-            @click="() => graph.zoom(graph.zoom() + 1)"
-          >
-            <i class="fa-solid fa-magnifying-glass-plus"></i>
-          </button>
-          <button
-            @click="() => graph.zoom(graph.zoom() - 1)"
-          >
-            <i class="fa-solid fa-magnifying-glass-minus"></i>
-          </button>
-          <button
-            x-show="isZoomEnabled"
-            @click="() => isZoomEnabled = false"
-          >
-            <i class="fa-solid fa-unlock"></i>
-          </button>
-          <button
-            x-show="!isZoomEnabled"
-            @click="() => isZoomEnabled = true"
-          >
-            <i class="fa-solid fa-lock"></i>
-          </button>
-        </div>
       </div>
     </div>
+
+    <div class="zoom-control" x-ref="zoomControl" x-show="graph !== undefined">
+      <button
+        @click="() => graph.zoom(graph.zoom() + 1)"
+      >
+        <i class="fa-solid fa-magnifying-glass-plus"></i>
+      </button>
+      <button
+        @click="() => graph.zoom(graph.zoom() - 1)"
+      >
+        <i class="fa-solid fa-magnifying-glass-minus"></i>
+      </button>
+      <button
+        x-show="isZoomEnabled"
+        @click="() => isZoomEnabled = false"
+      >
+        <i class="fa-solid fa-unlock"></i>
+      </button>
+      <button
+        x-show="!isZoomEnabled"
+        @click="() => isZoomEnabled = true"
+      >
+        <i class="fa-solid fa-lock"></i>
+      </button>
+    </div>
+
     <div x-ref="graph" class="graph"></div>
   </div>