diff --git a/custom/fitness-demo/README.md b/custom/fitness-demo/README.md
index 21c2c2b..1bec2c5 100644
--- a/custom/fitness-demo/README.md
+++ b/custom/fitness-demo/README.md
@@ -1,6 +1,6 @@
 # Fitness Demo
 
-![Basic Call](./image.png)
+![Fitness Demo](./image.png)
 
 ### Live example
 
diff --git a/custom/fitness-demo/components/App/AsideHeader.js b/custom/fitness-demo/components/App/AsideHeader.js
index 56cdba6..ca354dc 100644
--- a/custom/fitness-demo/components/App/AsideHeader.js
+++ b/custom/fitness-demo/components/App/AsideHeader.js
@@ -10,34 +10,37 @@ export const AsideHeader = () => {
     <>
       <div className="aside-header">
         <div
-          className={`header ${showAside === PEOPLE_ASIDE && 'active'}`}
+          className={`tab ${showAside === PEOPLE_ASIDE && 'active'}`}
           onClick={() => setShowAside(PEOPLE_ASIDE)}
         >
-          People
+          <p>People</p>
         </div>
         <div
-          className={`header ${showAside === CHAT_ASIDE && 'active'}`}
+          className={`tab ${showAside === CHAT_ASIDE && 'active'}`}
           onClick={() => setShowAside(CHAT_ASIDE)}
         >
-          Chat
+          <p>Chat</p>
         </div>
       </div>
       <style jsx>{`
         .aside-header {
           display: flex;
+          justify-content: center;
+          align-items: center;
           width: 100%;
           height: 5vh;
           text-align: center;
-        }
-        .aside-header .header {
-          height: 100%;
-          width: 50%;
           background: var(--gray-wash);
           color: var(--gray-dark);
+        }
+        
+        .tab {
+          height: 100%;
+          width: 50%;
           cursor: pointer;
         }
         
-        .header.active {
+        .tab.active {
           background: var(--reverse)!important;
           color: var(--text-default)!important;
           font-weight: 900;
diff --git a/custom/fitness-demo/image.png b/custom/fitness-demo/image.png
index 8623384..9dc90de 100644
Binary files a/custom/fitness-demo/image.png and b/custom/fitness-demo/image.png differ
diff --git a/custom/shared/components/ParticipantBar/ParticipantBar.js b/custom/shared/components/ParticipantBar/ParticipantBar.js
index 7552fdb..bfe4c05 100644
--- a/custom/shared/components/ParticipantBar/ParticipantBar.js
+++ b/custom/shared/components/ParticipantBar/ParticipantBar.js
@@ -240,7 +240,7 @@ export const ParticipantBar = ({
     const maybePromoteActiveSpeaker = () => {
       const fixedOther = fixed.find((f) => !f.isLocal);
       // Ignore when speaker is already at first position or component unmounted
-      if (!fixedOther || fixedOther?.id === activeSpeakerId || !scrollEl) {
+      if (!fixedOther || fixedOther?.id === currentSpeakerId || !scrollEl) {
         return false;
       }