diff --git a/firebase.json b/firebase.json
index d91a37cade..accd8fc9d4 100644
--- a/firebase.json
+++ b/firebase.json
@@ -70,7 +70,7 @@
       "port": 8080
     },
     "hosting": {
-      "port": 5000
+      "port": 5002
     },
     "pubsub": {
       "port": 8085
diff --git a/public/data/settings.json b/public/data/settings.json
index 55a83fb12e..9d18e784e2 100644
--- a/public/data/settings.json
+++ b/public/data/settings.json
@@ -22,6 +22,14 @@
       "route": "home",
       "permalink": "/",
       "label": "Home"
+    },{
+      "route": "schedule",
+      "permalink": "/schedule",
+      "label": "Schedule"
+    },{
+      "route": "speakers",
+      "permalink": "/speakers",
+      "label": "Speakers"
     },
     {
       "route": "team",
@@ -64,6 +72,10 @@
           "label": "CFP 2024",
           "link": "https://conference-hall.io/public/event/32IQQ5wYijdJdXrqtYsx"
         },
+        "schedule": {
+          "label": "CFP 2024",
+          "link": "https://conference-hall.io/public/event/32IQQ5wYijdJdXrqtYsx"
+        },
         "sponsors": {
           "label": "Sponsors",
           "anchor": "#partners-block"
diff --git a/src/elements/header-toolbar.ts b/src/elements/header-toolbar.ts
index 56e8efa79b..e5cba645ed 100644
--- a/src/elements/header-toolbar.ts
+++ b/src/elements/header-toolbar.ts
@@ -203,13 +203,6 @@ export class HeaderToolbar extends ReduxMixin(PolymerElement) {
           <!--            [[signInText]]-->
           <!--          </paper-tab>-->
 
-          <!--          <a href="[[ cfpLink ]]" target="_blank" rel="noopener noreferrer">-->
-          <!--            <paper-button class="buy-button" secondary>[[cfpHeader]]</paper-button>-->
-          <!--          </a>-->
-
-          <!--          <a href$="[[ticketUrl]]" target="_blank" rel="noopener noreferrer">-->
-          <!--            <paper-button class="buy-button" primary>[[buyTicket]]</paper-button>-->
-          <!--          </a>-->
         </paper-tabs>
 
         <notification-toggle></notification-toggle>
@@ -244,6 +237,36 @@ export class HeaderToolbar extends ReduxMixin(PolymerElement) {
           </div>
         </paper-menu-button>
 
+        <paper-menu-button
+          class="auth-menu"
+          hidden$="[[!signedIn]]"
+          vertical-align="top"
+          horizontal-align="right"
+          no-animations
+          layout
+          horizontal
+          center-center
+        >
+          <div
+            class="profile-image"
+            slot="dropdown-trigger"
+            style$="background-image: url('[[user.data.photoURL]]')"
+          ></div>
+          <div class="dropdown-panel profile-details" slot="dropdown-content" layout horizontal>
+            <div
+              class="profile-image"
+              slot="dropdown-trigger"
+              self-center
+              style$="background-image: url('[[user.data.photoURL]]')"
+            ></div>
+            <div layout vertical center-justified>
+              <span class="profile-name">[[user.data.displayName]]</span>
+              <span class="profile-email">[[user.data.email]]</span>
+              <span class="profile-action" role="button" on-click="signOut">[[signOutText]]</span>
+            </div>
+          </div>
+        </paper-menu-button>
+
         <paper-icon-button
           icon="hoverboard:account"
           on-click="signIn"
diff --git a/src/pages/home-page.ts b/src/pages/home-page.ts
index 79882ebdf9..cbe1aa08d4 100644
--- a/src/pages/home-page.ts
+++ b/src/pages/home-page.ts
@@ -197,15 +197,20 @@ export class HomePage extends ReduxMixin(PolymerElement) {
             <!--            </a>-->
 
             <div class="call-to-action">
-              <a
-                href$="[[heroSettings.callToAction.cfp.link]]"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <paper-button class="buy-button" primary
-                  >[[heroSettings.callToAction.cfp.label]]</paper-button
-                >
+              <a href="/schedule" >
+                <paper-button  primary>
+                  Programme
+                </paper-button>
               </a>
+<!--              <a-->
+<!--                href$="[[heroSettings.callToAction.cfp.link]]"-->
+<!--                target="_blank"-->
+<!--                rel="noopener noreferrer"-->
+<!--              >-->
+<!--                <paper-button class="buy-button" primary-->
+<!--                  >[[heroSettings.callToAction.cfp.label]]</paper-button-->
+<!--                >-->
+<!--              </a>-->
               <a href$="[[heroSettings.callToAction.sponsors.anchor]]">
                 <paper-button class="buy-button" primary on-click="scrollToSponsors"
                   >[[heroSettings.callToAction.sponsors.label]]</paper-button