diff --git a/custom/fitness-demo/components/Call/Header.js b/custom/fitness-demo/components/Call/Header.js
index 2da7f90..38a6d0f 100644
--- a/custom/fitness-demo/components/Call/Header.js
+++ b/custom/fitness-demo/components/Call/Header.js
@@ -60,16 +60,16 @@ export const Header = () => {
             participantCount === 1 ? 'participant' : 'participants'
           }`}
         </HeaderCapsule>
+        <HeaderCapsule>
+          {classType}
+          {capsuleLabel()}
+        </HeaderCapsule>
         {customCapsule && (
           <HeaderCapsule variant={customCapsule.variant}>
             {customCapsule.variant === 'recording' && <span />}
             {customCapsule.label}
           </HeaderCapsule>
         )}
-        <HeaderCapsule>
-          {classType}
-          {capsuleLabel()}
-        </HeaderCapsule>
 
         <style jsx>{`
           .room-header {
diff --git a/custom/fitness-demo/components/Call/VideoView.js b/custom/fitness-demo/components/Call/VideoView.js
index 1f8efa5..2e130ae 100644
--- a/custom/fitness-demo/components/Call/VideoView.js
+++ b/custom/fitness-demo/components/Call/VideoView.js
@@ -15,7 +15,7 @@ export const VideoView = () => {
   }, [screens, setIsShowingScreenshare]);
 
   if (!participants.length) return null;
-  if (participants.length === 1) return <InviteOthers />;
+  if (participants.length === 1 && !screens.length > 0) return <InviteOthers />;
 
   return viewMode === VIEW_MODE_SPEAKER ? <SpeakerView />: <GridView />;
 };