diff --git a/app/eventyay/agenda/templates/agenda/base.html b/app/eventyay/agenda/templates/agenda/base.html
index 1dd7d9d1b3..8c99b28b14 100644
--- a/app/eventyay/agenda/templates/agenda/base.html
+++ b/app/eventyay/agenda/templates/agenda/base.html
@@ -24,35 +24,7 @@
 {% endblock nav_link %}
 
 {% block header_tabs %}
-    {% if schedule or request.event.current_schedule %}
-        <a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
-            <i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
-        </a>
-    {% endif %}
-    {% if request.event.display_settings.schedule_display != "list" %}
-        <a href="{{ request.event.urls.talks }}" class="header-tab {% if "/talk/" in request.path_info %} active{% endif %}">
-            <i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
-        </a>
-    {% endif %}
-    {% if schedule or request.event.current_schedule %}
-        <a href="{{ request.event.urls.speakers }}" class="header-tab {% if "/speaker/" in request.path_info %} active{% endif %}">
-            <i class="fa fa-group"></i> {{ phrases.schedule.speakers }}
-        </a>
-    {% endif %}
-    {% for link in header_links %}
-        <a href="{% safelink link.url %}" target="_blank" rel="noopener" class="header-tab">
-            <i class="fa fa-link"></i> {{ link.label }}
-        </a>
-    {% endfor %}
-    {% if request.event.display_settings.ticket_link %}
-        <a href="{{ request.event.display_settings.ticket_link }}" class="header-tab">
-            <i class="fa fa-ticket"></i> {% translate "Tickets" %}
-        </a>
-    {% endif %}
-
-    <a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
-        <i class="fa fa-video-camera"></i> {% translate "Videos" %}
-    </a>
+    {% include 'agenda/fragment_nav.html' %}
 {% endblock header_tabs %}
 
 {% block content %}
diff --git a/app/eventyay/agenda/templates/agenda/fragment_nav.html b/app/eventyay/agenda/templates/agenda/fragment_nav.html
new file mode 100644
index 0000000000..4445b8653d
--- /dev/null
+++ b/app/eventyay/agenda/templates/agenda/fragment_nav.html
@@ -0,0 +1,43 @@
+{% load i18n %}
+{% load safelink %}
+
+<a href="{% url 'presale:event.index' event=request.event.slug organizer=request.event.organizer.slug %}" class="header-tab">
+    <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+</a>
+{% if schedule or request.event.current_schedule %}
+    <a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
+        <i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
+    </a>
+{% endif %}
+{% if request.event.display_settings.schedule_display != "list" %}
+    <a href="{{ request.event.urls.talks }}" class="header-tab {% if "/talk/" in request.path_info %} active{% endif %}">
+        <i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
+    </a>
+{% endif %}
+{% if schedule or request.event.current_schedule %}
+    <a href="{{ request.event.urls.speakers }}" class="header-tab {% if "/speaker/" in request.path_info %} active{% endif %}">
+        <i class="fa fa-group"></i> {{ phrases.schedule.speakers }}
+    </a>
+{% endif %}
+{% for link in header_links %}
+    <a href="{% safelink link.url %}" target="_blank" rel="noopener" class="header-tab">
+        <i class="fa fa-link"></i> {{ link.label }}
+    </a>
+{% endfor %}
+
+{% with cfp=request.event.cfp %}
+    {% if cfp.is_open or access_code.is_valid %}
+        <a class="header-tab {% if "/cfp" in request.path_info %} active{% endif %}"
+            href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
+            <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
+        </a>
+    {% else %}
+        <a class="header-tab disabled" tabindex="-1" aria-disabled="true" href="#">
+            <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers (Closed)" %}
+        </a>
+    {% endif %}
+{% endwith %}
+
+<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
+    <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
+</a>
diff --git a/app/eventyay/cfp/templates/cfp/event/cfp.html b/app/eventyay/cfp/templates/cfp/event/cfp.html
index d1107e00dd..eeb8132c6f 100644
--- a/app/eventyay/cfp/templates/cfp/event/cfp.html
+++ b/app/eventyay/cfp/templates/cfp/event/cfp.html
@@ -6,6 +6,11 @@
 {% load orga_edit_link %}
 {% load rich_text %}
 {% load rules %}
+{% load safelink %}
+
+{% block header_tabs %}
+    {% include 'agenda/fragment_nav.html' %}
+{% endblock header_tabs %}
 
 {% block content %}
     {% with cfp=request.event.cfp %}
diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html
index 5474df30e2..f3fc637aa8 100644
--- a/app/eventyay/common/templates/common/base.html
+++ b/app/eventyay/common/templates/common/base.html
@@ -83,18 +83,13 @@
         {% endif %}
         <div class="container{% block container_width %}{% endblock container_width %}" id="main-container">
             <header>
-                <h1>
-                    <a href="{% block nav_link %}{% endblock nav_link %}">
-                        {% if request.event and request.event.logo %}
-                            <img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}">
-                        {% elif request.event %}
-                            {{ request.event.name }}
-                        {% endif %}
-                    </a>
-                </h1>
-                <div class="header-wrapper">
-                    <div id="header-tabs">
-                        {% block header_tabs %}{% endblock header_tabs %}
+                <h1 class="public-event-header">
+                    <div class="event-logo">
+                        <a href="{% block nav_link %}{% endblock nav_link %}">
+                            {% if request.event and request.event.logo %}
+                                <img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}">
+                            {% endif %}
+                        </a>
                     </div>
                     <div class="header-row-right">
                         {% if request.event and request.event.locales|length > 1 and not is_html_export %}
@@ -134,30 +129,39 @@ <h1>
                                     {{ request.user.get_display_name }} <i class="fa fa-caret-down ml-1"></i>
                                 </summary>
                                 <div id="user-dropdown" class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
-                                    <a href="{% url "cfp:event.user.submissions" organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-sticky-note-o mr-2"></i>
+                                    <a href="{% url "eventyay_common:orders"%}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-shopping-cart mr-2 mb-1"></i>
+                                        {% translate "My orders" %}
+                                    </a>
+                                    <a href="{% url "cfp:event.user.submissions"  organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-sticky-note-o mr-2 mb-1"></i>
                                         {% translate "My proposals" %}
                                     </a>
+                                    <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-address-card-o mr-2 mb-1"></i>
+                                        {% translate "Speaker profile" %}
+                                    </a>
                                     <a href="{{ request.event.urls.user_mails }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-envelope mr-2"></i>
-                                        {% translate "My Emails" %}
+                                        <i class="fa fa-envelope mr-2 mb-1"></i>
+                                        {% translate "Event emails" %}
                                     </a>
-                                    <a href="{{ request.event.urls.user }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                        <i class="fa fa-address-card-o mr-2"></i>
-                                        {% translate "My profile" %}
+                                    <hr>
+                                    <a href="{% url "eventyay_common:account.general"%}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                        <i class="fa fa-user mr-2 mb-1"></i>
+                                        {% translate "Account" %}
                                     </a>
                                     {% if can_see_orga_area %}
                                         <hr>
-                                        <a href="{{ request.event.orga_urls.base }}" class="dropdown-item" role="menuitem" tabindex="-1">
-                                            <i class="fa fa-gears mr-2"></i>
-                                            {% translate "Organiser area" %}
+                                        <a href="{% url 'eventyay_common:event.index' organizer=request.event.organizer.slug event=request.event.slug %}" class="dropdown-item" role="menuitem" tabindex="-1">
+                                            <i class="fa fa-gears mr-2 mb-1"></i>
+                                            {% translate "Organizer area" %}
                                         </a>
                                     {% endif %}
                                     <hr>
                                     <form action="{% url 'common:auth.logout' %}" method="post">
                                         {% csrf_token %}
                                         <button class="dropdown-item" role="menuitem" type="submit" tabindex="-1">
-                                            <i class="fa fa-sign-out mr-2 ml-1"></i>
+                                            <i class="fa fa-sign-out mr-2 mb-1 ml-1"></i>
                                             {% translate "Logout" %}
                                         </button>
                                     </form>
@@ -171,6 +175,11 @@ <h1>
                             {% endif %}
                         {% endif %}
                     </div>
+                </h1>
+                <div class="header-wrapper">
+                    <div id="header-tabs">
+                        {% block header_tabs %}{% endblock header_tabs %}
+                    </div>
                 </div>
             </header>
             <div class="card" id="main-card">
diff --git a/app/eventyay/presale/templates/pretixpresale/base.html b/app/eventyay/presale/templates/pretixpresale/base.html
index eab433609f..19b6eb4410 100644
--- a/app/eventyay/presale/templates/pretixpresale/base.html
+++ b/app/eventyay/presale/templates/pretixpresale/base.html
@@ -13,6 +13,9 @@
     <title>{% block thetitle %}{% endblock %}</title>
     {% if css_file %}
         <link rel="stylesheet" type="text/css" href="{{ css_file }}" />
+        {% compress css %}
+            <link rel="stylesheet" type="text/css" href="{% static "pretixpresale/scss/custom.css" %}" />
+        {% endcompress %}
     {% else %}
         {% compress css %}
             <link rel="stylesheet" type="text/x-scss" href="{% static "pretixpresale/scss/main.scss" %}"/>
@@ -59,7 +62,7 @@
             <img id="header-image" src="{{ MEDIA_PREFIX }}{{ event_logo }}" alt="{{ event.name }}" class="event-logo" />
         {% endif %}
 </div>
-<header {% if event_logo %} class="custom-header" {% endif %}>
+<header {% if event_logo %} class="custom-header" {% endif %} >
 {% block above %}
 {% endblock %}
 </header>
diff --git a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
index cb8c9d1e55..2c416c1c10 100644
--- a/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
+++ b/app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html
@@ -3,37 +3,44 @@
 {% load eventurl %}
 {% load event_tags %}
 
-<nav id="schedule-nav"{% if with_margin %} class="p-3"{% endif %}>
+<nav id='header-nav-bar'>
     <div class="navigation">
-        {% if request.event|get_feature_flag:'show_schedule' %}
-            <div class="navigation-button">
-                <a href="{{ request.event.talk_schedule_url }}" class="header-nav btn btn-outline-success">
-                    <i class="fa fa-calendar"></i> {% translate "Schedule" %}
-                </a>
-            </div>
-            <div class="navigation-button">
-                <a href="{{ request.event.talk_session_url }}" class="header-nav btn btn-outline-success">
-                    <i class="fa fa-comments-o"></i> {% translate "Sessions" %}
+        <a href="#" class="header-tab underline">
+            <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+        </a>
+
+        {% if schedule or request.event.current_schedule %}
+            <a href="{{ request.event.talk_schedule_url }}" class="header-tab ">
+                <i class="fa fa-calendar"></i> {% translate "Schedule" %}
+            </a>
+
+            <a href="{{ request.event.talk_session_url }}" class="header-tab">
+                <i class="fa fa-comments-o"></i> {% translate "Sessions" %}
+            </a>
+
+            <a href="{{ request.event.talk_speaker_url }}" class="header-tab">
+                <i class="fa fa-group"></i> {% translate "Speakers" %}
+            </a>
+        {% endif %}
+
+        {% with cfp=request.event.cfp %}
+            {% if cfp.is_open or access_code.is_valid %}
+                <a class="header-tab"
+                    href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
+                    <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
                 </a>
-            </div>
-            <div class="navigation-button">
-                <a href="{{ request.event.talk_speaker_url }}" class="header-nav btn btn-outline-success">
-                    <i class="fa fa-group"></i> {% translate "Speakers" %}
+            {% else %}
+                <a class="header-tab disabled" tabindex="-1" aria-disabled="true" href="#">
+                    <i class="fa fa-bullhorn"></i> {% translate "Call for Speakers (Closed)" %}
                 </a>
-            </div>
-        {% endif %}
-        <div class="navigation-button">
-            <a target="_blank" class="header-nav btn btn-outline-success" data-toggle="popover">
-                <i class="fa fa-ticket"></i> {% translate "Tickets" %}
+            {% endif %}
+        {% endwith %}
+
+        <div class="video-link">
+            <a id='join-event-link' class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
+                href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
+                <i class="fa fa-video-camera"></i> {% translate "Join online video" %}
             </a>
         </div>
-        {% if is_video_plugin_enabled %}
-            <div class="video-link">
-                <a join-event-link class="header-nav btn btn-outline-success join-event"
-                    href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
-                    <i class="fa fa-video-camera"></i> {% translate "Join online event" %}
-                </a>
-            </div>
-        {% endif %}
     </div>
 </nav>
diff --git a/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html b/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
index a937200d17..8a29c21695 100644
--- a/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
+++ b/app/eventyay/presale/templates/pretixpresale/fragment_login_status.html
@@ -7,7 +7,8 @@
 {{ show_organizer_area|json_script:"show_organizer_area" }}
 {{ 'popover-profile'|json_script:"popover_toggle" }}
 {{ base_path|json_script:"base_path" }}
-<nav class="login-hdr" aria-label='{% translate "account" %}'>
+<nav class="login-hdr" aria-label="{% translate 'account' %}" style="{% if request.event and request.event.settings.event_logo_image %}margin-right: 18rem{% else %}margin-right: 0{% endif %}">
+
     {% if request.user.is_authenticated %}
         <div class="navigation-button">
             <a target="_blank" class="header-nav btn btn-outline-success" data-toggle="popover-profile">
diff --git a/app/eventyay/static/cfp/css/_layout.css b/app/eventyay/static/cfp/css/_layout.css
index f600d456fd..a565ec118f 100644
--- a/app/eventyay/static/cfp/css/_layout.css
+++ b/app/eventyay/static/cfp/css/_layout.css
@@ -37,14 +37,12 @@ header {
 
   #event-logo {
     max-height: 140px;
+    border-radius: 10px;
   }
 
   .header-wrapper {
     width: 100%;
     max-width: calc(100vw - 8px);
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
     word-break: keep-all;
     flex-wrap: nowrap;
   }
@@ -76,6 +74,8 @@ header {
     display: flex;
     flex-wrap: nowrap;
     flex-shrink: 0;
+    align-items: flex-end;
+    font-size: 1rem;
 
     /* Inline locale links */
     .locales-inline {
@@ -137,6 +137,15 @@ header {
   }
 }
 
+#join-event-link {
+  margin-left: auto;
+}
+
+.public-event-header {
+  display: flex;
+  margin-bottom: 14px;
+}
+
 #main-card {
   min-height: 300px;
   box-shadow: 0 5px 10px rgb(0 0 0 / 0.2);
@@ -180,6 +189,7 @@ footer {
   margin-right: auto;
   margin-left: auto;
   max-width: 1140px;
+  margin-top: 3.8rem !important;
 }
 
 .url-links {
@@ -222,12 +232,14 @@ footer {
 @media (max-width: 992px) {
   #main-container {
     max-width: 960px;
+    margin-top: 3.8rem !important;
   }
 }
 
 @media (max-width: 768px) {
   #main-container {
     max-width: 720px;
+    margin-top: 3.8rem !important;
     header .header-wrapper {
       flex-direction: column-reverse;
       align-items: flex-start;
@@ -240,6 +252,7 @@ footer {
     padding: 0;
     padding-top: 20px;
     width: 100%;
+    margin-top: 3.8rem !important;
 
     main {
       width: 100%;
@@ -250,9 +263,16 @@ footer {
       padding: 0;
       #event-logo {
         max-height: 120px;
+        border-radius: 10px;
       }
     }
 
+    .header-wrapper {
+      overflow: auto;
+      background: var(--color-bg);
+      padding-bottom: 6rem;
+    }
+
     .user-row {
       flex-direction: column;
     }
diff --git a/app/eventyay/static/pretixpresale/js/ui/popover.js b/app/eventyay/static/pretixpresale/js/ui/popover.js
index 4141dacc7e..f1e62858c5 100644
--- a/app/eventyay/static/pretixpresale/js/ui/popover.js
+++ b/app/eventyay/static/pretixpresale/js/ui/popover.js
@@ -108,21 +108,36 @@ $(function () {
     `<div data-name="popover-profile-menu">
       <div class="profile-menu">
           <a href="${basePath}${orderPath}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-shopping-cart"></i> ${window.gettext('My Orders')}
+              <i class="fa fa-shopping-cart"></i> ${window.gettext('My orders')}
           </a>
       </div>
       <div class="profile-menu">
-          <a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-user"></i> ${window.gettext('My Account')}
+          <a href="${basePath}/${organizerName}/${eventSlug}/me/submissions/" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-sticky-note-o"></i> ${window.gettext('My proposals')}
           </a>
+      </div>
+      <div class="profile-menu">
+          <a href="${basePath}/${organizerName}/${eventSlug}/me" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-address-card-o"></i> ${window.gettext('Speaker profile')}
+          </a>
+      </div>
+      <div class="profile-menu">
+          <a href="${basePath}/${organizerName}/${eventSlug}/me/mails/" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-envelope"></i> ${window.gettext('Event emails')}
+          </a>
+      </div>
+      <div class="profile-menu">
+        <a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
+        <i class="fa fa-user"></i> ${window.gettext('Account')}
+        </a>
       </div>`,
   ];
 
   if (showOrganizerArea) {
     blocks.push(
       `<div class="profile-menu organizer-area">
-          <a href="${basePath}/control/event/${organizerName}/${eventSlug}" target="_self" class="btn btn-outline-success">
-              <i class="fa fa-users"></i> ${window.gettext('Organizer Area')}
+          <a href="${basePath}/common/event/${organizerName}/${eventSlug}" target="_self" class="btn btn-outline-success">
+              <i class="fa fa-gears"></i> ${window.gettext('Organizer area')}
           </a>
       </div>`
     );
diff --git a/app/eventyay/static/pretixpresale/scss/custom.css b/app/eventyay/static/pretixpresale/scss/custom.css
index e7524db878..7cfec484fc 100644
--- a/app/eventyay/static/pretixpresale/scss/custom.css
+++ b/app/eventyay/static/pretixpresale/scss/custom.css
@@ -17,8 +17,47 @@
     height: 220px;
     align-items: flex-end;
     display: flex;
+    margin-top: -3.8rem;
 }
 
+.video-link {
+    margin-left: auto;
+}
+
+#header-nav-bar {
+    margin-top: 10px;
+    margin-bottom: 3rem;
+    overflow: auto;
+}
+
+#header-nav-bar div {
+    font-size: 1.65rem;
+    display: flex;
+    gap: 2rem;
+}
+
+#header-nav-bar a {
+    cursor: pointer;
+    position: relative;
+    text-decoration: none;
+    padding-bottom: 4px;
+}
+
+#header-nav-bar a.underline::after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    left: -10px;
+    width: calc(100% + 20px);
+    height: 2px;
+    background-color: currentColor;
+}
+
+#header-nav-bar a:not(.underline):hover {
+    border-bottom: 2px dotted currentColor;
+}
+
+
 #schedule-nav {
     margin: 16px 0px;
     .header-nav {
diff --git a/app/eventyay/static/pretixpresale/scss/custom.scss b/app/eventyay/static/pretixpresale/scss/custom.scss
index 8070be9959..f7eb2b4d22 100644
--- a/app/eventyay/static/pretixpresale/scss/custom.scss
+++ b/app/eventyay/static/pretixpresale/scss/custom.scss
@@ -17,6 +17,44 @@
     height: 220px;
     align-items: flex-end;
     display: flex;
+    margin-top: -3.8rem;
+}
+
+.video-link {
+    margin-left: auto;
+}
+
+#header-nav-bar {
+    margin-top: 10px;
+    margin-bottom: 3rem;
+    overflow: auto;
+    
+    div {
+        font-size: 1.65rem;
+        display: flex;
+        gap: 2rem;
+    }
+    
+    a {
+        cursor: pointer;
+        position: relative;
+        text-decoration: none;
+        padding-bottom: 4px;
+    }
+
+    a.underline::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: -10px;
+        width: calc(100% + 20px);
+        height: 2px;
+        background-color: currentColor;
+    }
+
+    a:not(.underline):hover {
+        border-bottom: 2px dotted currentColor;
+    }
 }
 
 #schedule-nav {