diff --git a/dashboard/src/lib/Navigation.svelte b/dashboard/src/lib/Navigation.svelte
index a2d8cbc1..59ca6a47 100644
--- a/dashboard/src/lib/Navigation.svelte
+++ b/dashboard/src/lib/Navigation.svelte
@@ -24,7 +24,7 @@ import { get } from 'svelte/store';
 
 </script>
     <Navbar color="light" light expand="lg" class="mb-4">
-        <NavbarBrand>PluralKit</NavbarBrand>
+        <Link to="/" class="navbar-brand"><NavbarBrand tabindex={-1} class="m-0">PluralKit</NavbarBrand></Link>
         <NavbarToggler on:click={toggle}></NavbarToggler>
         <Collapse {isOpen} navbar expand="lg">
             <Nav class="ms-auto" navbar>
@@ -48,10 +48,10 @@ import { get } from 'svelte/store';
                 </Dropdown>
                 {/if}
                 <NavItem>
-                    <NavLink href="/settings">Settings</NavLink>
+                    <Link to="/settings" class="nav-link">Settings</Link>
                 </NavItem>
                 <NavItem>
-                    <NavLink href="/profile">Public</NavLink>
+                    <Link to="/profile" class="nav-link">Public</Link>
                 </NavItem>
             </Nav>
         </Collapse>
diff --git a/dashboard/src/lib/system/Privacy.svelte b/dashboard/src/lib/system/Privacy.svelte
index 35d0193a..3fe7dadf 100644
--- a/dashboard/src/lib/system/Privacy.svelte
+++ b/dashboard/src/lib/system/Privacy.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { Card, CardHeader, CardBody, CardTitle, Row, Col, Button, Spinner } from 'sveltestrap';
+    import {Link} from 'svelte-navigator';
     import FaUserLock from 'svelte-icons/fa/FaUserLock.svelte';
     import PrivacyEdit from './PrivacyEdit.svelte';
 
@@ -42,8 +43,8 @@
             </Col>
         </Row>
         <Button style="flex: 0" color="primary" on:click={() => editMode = true}>Edit</Button>
-        <Button style="flex: 0" color="secondary" on:click={() => window.location.href = window.location.origin+"/dash/bulk-member-privacy"}>Bulk member privacy</Button>
-        <Button style="flex: 0" color="secondary" on:click={() => window.location.href = window.location.origin+"/dash/bulk-group-privacy"}>Bulk group privacy</Button>
+        <Link to="/dash/bulk-member-privacy"><Button style="flex: 0" color="secondary">Bulk member privacy</Button></Link>
+        <Link to="/dash/bulk-group-privacy"><Button style="flex: 0" color="secondary">Bulk group privacy</Button></Link>
         {/if}
     </CardBody>
 </Card>
\ No newline at end of file