diff --git a/assets/css/index.css b/assets/css/index.css
index 55d3c159..83f47a54 100644
--- a/assets/css/index.css
+++ b/assets/css/index.css
@@ -12,18 +12,21 @@
   --color-text: var(--color-black);
   --color-text-grey: var(--color-grey);
   --color-background: var(--color-white);
-  --color-code-light-grey:  #cacbd1;
-  --color-code-comment:     #a9aaad;
-  --color-code-white:       #c5c9c6;
-  --color-code-red:         #d16464;
-  --color-code-orange:      #de935f;
-  --color-code-yellow:      #f0c674;
-  --color-code-green:       #a7bd68;
-  --color-code-aqua:        #8abeb7;
-  --color-code-blue:        #7e9abf;
-  --color-code-purple:      #b294bb;
-  --font-family-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  --font-family-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  --color-code-light-grey: #cacbd1;
+  --color-code-comment: #a9aaad;
+  --color-code-white: #c5c9c6;
+  --color-code-red: #d16464;
+  --color-code-orange: #de935f;
+  --color-code-yellow: #f0c674;
+  --color-code-green: #a7bd68;
+  --color-code-aqua: #8abeb7;
+  --color-code-blue: #7e9abf;
+  --color-code-purple: #b294bb;
+  --font-family-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+    Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
+    "Segoe UI Symbol";
+  --font-family-mono: "SFMono-Regular", Consolas, "Liberation Mono", Menlo,
+    Courier, monospace;
 }
 
 html {
@@ -53,7 +56,8 @@ button {
   color: currentColor;
   cursor: pointer;
 }
-strong, b {
+strong,
+b {
   font-weight: 600;
 }
 small {
@@ -82,7 +86,7 @@ small {
   cursor: pointer;
 }
 .logo summary svg {
-  margin-right: .75rem;
+  margin-right: 0.75rem;
 }
 .logo summary::-webkit-details-marker {
   display: none;
@@ -100,7 +104,7 @@ small {
   background: var(--color-black);
   color: var(--color-white);
   max-width: 25rem;
-  box-shadow: rgba(0,0,0, .1) 0 5px 10px;
+  box-shadow: rgba(0, 0, 0, 0.1) 0 5px 10px;
 }
 .logo-dropdown-box header {
   display: flex;
@@ -110,12 +114,12 @@ small {
 }
 .logo-dropdown-box header a {
   display: block;
-  padding: .75rem 1rem;
+  padding: 0.75rem 1rem;
   font-weight: 600;
 }
 
 .killer-button {
-  padding: .75rem 1rem;
+  padding: 0.75rem 1rem;
 }
 .killer-button svg * {
   fill: #fff;
@@ -137,11 +141,11 @@ small {
 }
 .logo-dropdown-box-content h2 {
   text-transform: uppercase;
-  font-size: .75rem;
+  font-size: 0.75rem;
   font-weight: 600;
-  letter-spacing: .1em;
+  letter-spacing: 0.1em;
   color: #999;
-  margin-bottom: .5rem;
+  margin-bottom: 0.5rem;
 }
 .logo-dropdown-box ul:not(:last-child) {
   margin-bottom: 1.5rem;
@@ -153,25 +157,30 @@ small {
 }
 .logo-dropdown-box-content a:before {
   content: "→";
-  padding-right: .5rem;
+  padding-right: 0.5rem;
 }
 .logo-dropdown-box-login {
   background: #222;
-  padding: .5rem .75rem;
-  margin-bottom: .75rem;
+  padding: 0.5rem 0.75rem;
+  margin-bottom: 0.75rem;
 }
 .logo-dropdown-box-login small {
   color: #999;
-  font-size: .875rem;
+  font-size: 0.875rem;
   display: block;
 }
 .logo-dropdown-box footer {
   border-top: 1px solid #555;
-  padding: .75rem 1rem;
+  padding: 0.75rem 1rem;
   line-height: 1.5em;
-  margin-top: .5rem;
+  margin-top: 0.5rem;
   color: #999;
-  font-size: .875rem;
+  font-size: 0.875rem;
+}
+
+.user {
+  display: flex;
+  font-size: 0.875rem;
 }
 
 .menu {
@@ -187,10 +196,10 @@ small {
 
 .social {
   display: flex;
-  padding: 0 .5rem;
+  padding: 0 0.5rem;
 }
 .social a {
-  padding: 1rem .5rem;
+  padding: 1rem 0.5rem;
 }
 
 .section {
@@ -217,7 +226,12 @@ small {
   grid-auto-flow: dense;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-size: inherit;
   font-weight: inherit;
   line-height: inherit;
@@ -274,7 +288,7 @@ h1, h2, h3, h4, h5, h6 {
   font-family: var(--font-family-mono);
   font-size: 1em;
   background: var(--color-light);
-  padding: 0 .5rem;
+  padding: 0 0.5rem;
   display: inline-block;
   color: var(--color-black);
 }
@@ -309,7 +323,7 @@ h1, h2, h3, h4, h5, h6 {
   margin: 3rem 0;
 }
 .text figcaption {
-  padding-top: .75rem;
+  padding-top: 0.75rem;
   color: var(--color-text-grey);
 }
 
@@ -337,7 +351,7 @@ hr {
   color: var(--color-white);
   display: inline-flex;
   justify-content: center;
-  padding: .75rem 1.5rem;
+  padding: 0.75rem 1.5rem;
   border: 4px solid var(--color-white);
   outline: 2px solid var(--color-black);
 }
@@ -375,7 +389,7 @@ hr {
 }
 .img-caption,
 .video-caption {
-  padding-top: .75rem;
+  padding-top: 0.75rem;
   line-height: 1.5em;
 }
 
@@ -394,7 +408,7 @@ hr {
 
 .footer h2 {
   font-weight: 600;
-  margin-bottom: .75rem;
+  margin-bottom: 0.75rem;
 }
 .footer ul,
 .footer p {
@@ -407,7 +421,6 @@ hr {
   color: var(--color-text);
 }
 
-
 .map {
   --w: 2;
   --h: 1;
@@ -428,7 +441,7 @@ hr {
 }
 
 .margin-s {
-  margin-bottom: .75rem;
+  margin-bottom: 0.75rem;
 }
 .margin-m {
   margin-bottom: 1.5rem;
@@ -443,7 +456,6 @@ hr {
   margin-bottom: 6rem;
 }
 
-
 @media screen and (min-width: 60rem) {
   body {
     --padding: 3rem;
@@ -455,5 +467,4 @@ hr {
   .grid > .column {
     grid-column: span var(--columns);
   }
-
 }
diff --git a/assets/icons/twitter.svg b/assets/icons/twitter.svg
deleted file mode 100644
index 683d57e8..00000000
--- a/assets/icons/twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g class="nc-icon-wrapper" fill="#111111"><path fill="#111111" d="M16,3c-0.6,0.3-1.2,0.4-1.9,0.5c0.7-0.4,1.2-1,1.4-1.8c-0.6,0.4-1.3,0.6-2.1,0.8c-0.6-0.6-1.5-1-2.4-1 C9.3,1.5,7.8,3,7.8,4.8c0,0.3,0,0.5,0.1,0.7C5.2,5.4,2.7,4.1,1.1,2.1c-0.3,0.5-0.4,1-0.4,1.7c0,1.1,0.6,2.1,1.5,2.7 c-0.5,0-1-0.2-1.5-0.4c0,0,0,0,0,0c0,1.6,1.1,2.9,2.6,3.2C3,9.4,2.7,9.4,2.4,9.4c-0.2,0-0.4,0-0.6-0.1c0.4,1.3,1.6,2.3,3.1,2.3 c-1.1,0.9-2.5,1.4-4.1,1.4c-0.3,0-0.5,0-0.8,0c1.5,0.9,3.2,1.5,5,1.5c6,0,9.3-5,9.3-9.3c0-0.1,0-0.3,0-0.4C15,4.3,15.6,3.7,16,3z"/></g></svg>
\ No newline at end of file
diff --git a/site/snippets/blog/header.php b/site/snippets/blog/header.php
index df7cc436..c1cef4c5 100644
--- a/site/snippets/blog/header.php
+++ b/site/snippets/blog/header.php
@@ -2,10 +2,13 @@
 
 <header class="header">
   <?php snippet('logo', ['section' => 'blog']) ?>
+
   <nav class="menu">
+    <?php snippet('user') ?>
+
     <span class="social">
       <a href="<?= url('blog.rss') ?>"><?= svg('assets/icons/feed.svg') ?></a>
-      <a href="https://twitter.com/getkirby"><?= svg('assets/icons/twitter.svg') ?></a>
+      <a href="https://chat.getkirby.com"><?= svg('assets/icons/discord.svg') ?></a>
       <a href="https://instagram.com/getkirby"><?= svg('assets/icons/instagram.svg') ?></a>
     </span>
   </nav>
diff --git a/site/snippets/home/header.php b/site/snippets/home/header.php
index 90f51f7e..0214fd02 100644
--- a/site/snippets/home/header.php
+++ b/site/snippets/home/header.php
@@ -3,6 +3,7 @@
 <header class="header">
   <?php snippet('logo', ['section' => 'home']) ?>
   <nav class="menu">
+    <?php snippet('user') ?>
     <?php snippet('social') ?>
   </nav>
 </header>
diff --git a/site/snippets/microsite/header.php b/site/snippets/microsite/header.php
index da4c7a1e..6bae4808 100644
--- a/site/snippets/microsite/header.php
+++ b/site/snippets/microsite/header.php
@@ -3,6 +3,7 @@
 <header class="header">
   <?php snippet('logo', ['section' => 'microsite']) ?>
   <nav class="menu">
+    <?php snippet('user') ?>
     <?php snippet('social') ?>
   </nav>
 </header>
diff --git a/site/snippets/restaurant/header.php b/site/snippets/restaurant/header.php
index a156ac49..d54d070f 100644
--- a/site/snippets/restaurant/header.php
+++ b/site/snippets/restaurant/header.php
@@ -2,7 +2,9 @@
 
 <header class="header">
   <?php snippet('logo', ['section' => 'restaurant']) ?>
+
   <nav class="menu">
+    <?php snippet('user') ?>
     <?php snippet('social') ?>
   </nav>
 </header>
diff --git a/site/snippets/shop/header.php b/site/snippets/shop/header.php
index 0000173d..ad6e41f4 100644
--- a/site/snippets/shop/header.php
+++ b/site/snippets/shop/header.php
@@ -3,6 +3,7 @@
 <header class="header">
   <?php snippet('logo', ['section' => 'shop']) ?>
   <nav class="menu">
+    <?php snippet('user') ?>
     <?php snippet('social') ?>
   </nav>
 </header>
diff --git a/site/snippets/social.php b/site/snippets/social.php
index e8055afc..430fa49b 100644
--- a/site/snippets/social.php
+++ b/site/snippets/social.php
@@ -1,5 +1,4 @@
 <span class="social">
-  <a href="https://twitter.com/getkirby"><?= svg('assets/icons/twitter.svg') ?></a>
   <a href="https://chat.getkirby.com"><?= svg('assets/icons/discord.svg') ?></a>
   <a href="https://instagram.com/getkirby"><?= svg('assets/icons/instagram.svg') ?></a>
 </span>
diff --git a/site/snippets/user.php b/site/snippets/user.php
new file mode 100644
index 00000000..8858922d
--- /dev/null
+++ b/site/snippets/user.php
@@ -0,0 +1,6 @@
+<?php if ($user = $kirby->user()): ?>
+<div class="user">
+	<a href="<?= url('panel') ?>">Logged in as: <b><?= $user->email() ?></b></a>
+	<a href="<?= $page->panel()->url() ?>">Edit this page</a>
+</div>
+<?php endif ?>
\ No newline at end of file