diff --git a/frontend/src/components/meeting/CustomParticipantTile/index.tsx b/frontend/src/components/meeting/CustomParticipantTile/index.tsx
index 6f1c00c..10a0e0b 100644
--- a/frontend/src/components/meeting/CustomParticipantTile/index.tsx
+++ b/frontend/src/components/meeting/CustomParticipantTile/index.tsx
@@ -5,24 +5,37 @@ import {
   useIsSpeaking,
 } from "@livekit/components-react";
 import { Track } from "livekit-client";
+import { Pin } from "lucide-react";
 import { useParticipantData } from "./useParticipantData";
 import { AvatarDisplay } from "./AvatarDisplay";
 import { ParticipantInfo } from "./ParticipantInfo";
+import { usePinContext } from "../LiveKitMeetingRoom/PinContext";
 
 export const CustomParticipantTile: React.FC = () => {
   const trackRef = useEnsureTrackRef();
   const { participant, avatarUrl } = useParticipantData();
   const isSpeaking = useIsSpeaking(participant);
+  const { pinnedIdentity, setPinnedIdentity } = usePinContext();
 
   const isCameraTrack = trackRef?.source === Track.Source.Camera;
+  const isScreenShare = trackRef?.source === Track.Source.ScreenShare;
   const hasVideo =
     isCameraTrack &&
     trackRef?.publication?.isSubscribed &&
     !trackRef?.publication?.isMuted;
   const showAvatar = isCameraTrack && !hasVideo;
 
+  const isPinned = participant?.identity === pinnedIdentity;
+
+  const handlePinToggle = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    if (!participant) return;
+    setPinnedIdentity(isPinned ? null : participant.identity);
+  };
+
   return (
     <div
+      className="group"
       style={{
         position: "relative",
         width: "100%",
@@ -37,6 +50,20 @@ export const CustomParticipantTile: React.FC = () => {
       }}
     >
       <ParticipantTile />
+      {/* Pin button — visible on hover, always visible (blue) when pinned, hidden for screen share */}
+      {participant && !isScreenShare && (
+        <button
+          onClick={handlePinToggle}
+          title={isPinned ? "Unpin" : "Pin"}
+          className={`absolute top-2 left-2 z-20 flex items-center justify-center w-8 h-8 rounded-lg transition-opacity cursor-pointer backdrop-blur-sm border ${
+            isPinned
+              ? "opacity-100 bg-blue-500/80 border-blue-400/60 text-white"
+              : "opacity-0 group-hover:opacity-100 bg-black/60 hover:bg-black/80 border-white/20 text-white"
+          }`}
+        >
+          <Pin className={`w-4 h-4 ${isPinned ? "fill-current" : ""}`} />
+        </button>
+      )}
       {showAvatar && participant && (
         <div
           style={{
diff --git a/frontend/src/components/meeting/CustomParticipantTile/useParticipantData.ts b/frontend/src/components/meeting/CustomParticipantTile/useParticipantData.ts
index 702c299..184be62 100644
--- a/frontend/src/components/meeting/CustomParticipantTile/useParticipantData.ts
+++ b/frontend/src/components/meeting/CustomParticipantTile/useParticipantData.ts
@@ -1,8 +1,9 @@
 import { useMemo } from "react";
-import { useEnsureParticipant } from "@livekit/components-react";
+import { useEnsureTrackRef } from "@livekit/components-react";
 
 export const useParticipantData = () => {
-  const participant = useEnsureParticipant();
+  const trackRef = useEnsureTrackRef();
+  const participant = trackRef?.participant ?? null;
 
   const metadata = useMemo(() => {
     try {
diff --git a/frontend/src/components/meeting/LiveKitMeetingRoom/PinContext.tsx b/frontend/src/components/meeting/LiveKitMeetingRoom/PinContext.tsx
new file mode 100644
index 0000000..b989cc1
--- /dev/null
+++ b/frontend/src/components/meeting/LiveKitMeetingRoom/PinContext.tsx
@@ -0,0 +1,13 @@
+import { createContext, useContext } from "react";
+
+interface PinContextValue {
+  pinnedIdentity: string | null;
+  setPinnedIdentity: (identity: string | null) => void;
+}
+
+export const PinContext = createContext<PinContextValue>({
+  pinnedIdentity: null,
+  setPinnedIdentity: () => {},
+});
+
+export const usePinContext = () => useContext(PinContext);
diff --git a/frontend/src/components/meeting/LiveKitMeetingRoom/VideoLayout.tsx b/frontend/src/components/meeting/LiveKitMeetingRoom/VideoLayout.tsx
index 515496e..24e3608 100644
--- a/frontend/src/components/meeting/LiveKitMeetingRoom/VideoLayout.tsx
+++ b/frontend/src/components/meeting/LiveKitMeetingRoom/VideoLayout.tsx
@@ -1,13 +1,16 @@
-import React from "react";
+import React, { useState } from "react";
 import {
   GridLayout,
   FocusLayout,
   FocusLayoutContainer,
   CarouselLayout,
+  TrackRefContext,
+  ParticipantContext,
 } from "@livekit/components-react";
 import { Track } from "livekit-client";
 import type { TrackReferenceOrPlaceholder } from "@livekit/components-react";
 import { CustomParticipantTile } from "../CustomParticipantTile";
+import { PinContext } from "./PinContext";
 
 interface VideoLayoutProps {
   tracks: TrackReferenceOrPlaceholder[];
@@ -18,22 +21,258 @@ export const VideoLayout: React.FC<VideoLayoutProps> = ({
   tracks,
   hasScreenShare,
 }) => {
+  const [isFullscreen, setIsFullscreen] = useState(false);
+  const [pinnedIdentity, setPinnedIdentity] = useState<string | null>(null);
+  const [isPiP, setIsPiP] = useState(false);
+  const screenShareContainerRef = React.useRef<HTMLDivElement | null>(null);
+
+  const togglePiP = async () => {
+    try {
+      if (document.pictureInPictureElement) {
+        await document.exitPictureInPicture();
+        setIsPiP(false);
+      } else {
+        const video = screenShareContainerRef.current?.querySelector("video");
+        if (video) {
+          await video.requestPictureInPicture();
+          setIsPiP(true);
+        }
+      }
+    } catch (e) {
+      console.warn("PiP not supported:", e);
+    }
+  };
+
+  // Track PiP exit via browser controls
+  React.useEffect(() => {
+    const onExit = () => setIsPiP(false);
+    document.addEventListener("leavepictureinpicture", onExit);
+    return () => document.removeEventListener("leavepictureinpicture", onExit);
+  }, []);
+
+  const pinContextValue = { pinnedIdentity, setPinnedIdentity };
+
+  // Find the pinned participant's camera track (fallback to any track)
+  const pinnedTrack = pinnedIdentity
+    ? (tracks.find(
+        (t) =>
+          t.participant?.identity === pinnedIdentity &&
+          t.source === Track.Source.Camera,
+      ) ?? tracks.find((t) => t.participant?.identity === pinnedIdentity))
+    : null;
+
   if (hasScreenShare) {
+    const screenTrack = tracks.find(
+      (t) => t.source === Track.Source.ScreenShare,
+    );
+
+    if (isFullscreen) {
+      return (
+        <PinContext.Provider value={pinContextValue}>
+          <div className="group relative w-full h-full bg-black">
+            <FocusLayout trackRef={screenTrack} />
+            <button
+              onClick={() => setIsFullscreen(false)}
+              title="Exit fullscreen"
+              className="absolute top-3 right-3 z-50 flex items-center justify-center w-9 h-9 rounded-lg bg-black/60 hover:bg-black/80 text-white transition-opacity opacity-0 group-hover:opacity-100 cursor-pointer backdrop-blur-sm border border-white/20"
+            >
+              <svg
+                className="w-5 h-5"
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth={2}
+                  d="M9 9L4 4m0 0l5 0M4 4l0 5M15 9l5-5m0 0l-5 0m5 0l0 5M9 15l-5 5m0 0l5 0m-5 0l0-5M15 15l5 5m0 0l-5 0m5 0l0-5"
+                />
+              </svg>
+            </button>
+          </div>
+        </PinContext.Provider>
+      );
+    }
+
+    // CarouselLayout uses useVisualStableUpdate internally and ignores order.
+    // When pinned, render all tiles manually so the pinned one stays first.
+    const pinnedCarouselTrack = pinnedIdentity
+      ? (tracks.find(
+          (t) =>
+            t.participant?.identity === pinnedIdentity &&
+            t.source === Track.Source.Camera,
+        ) ?? tracks.find((t) => t.participant?.identity === pinnedIdentity))
+      : null;
+
+    const unpinnedTracks = pinnedIdentity
+      ? tracks.filter(
+          (t) =>
+            t.participant?.identity !== pinnedIdentity &&
+            t.source !== Track.Source.ScreenShare,
+        )
+      : tracks.filter((t) => t.source !== Track.Source.ScreenShare);
+
+    const orderedTracks = pinnedCarouselTrack
+      ? [pinnedCarouselTrack, ...unpinnedTracks]
+      : null;
+
+    // Non-pinned case: also filter screen share from carousel
+    const carouselTracks = tracks.filter(
+      (t) => t.source !== Track.Source.ScreenShare,
+    );
+
+    return (
+      <PinContext.Provider value={pinContextValue}>
+        <FocusLayoutContainer>
+          {orderedTracks ? (
+            <div className="lk-carousel lk-carousel-vertical">
+              {orderedTracks.map((t) => (
+                <ParticipantContext.Provider
+                  key={`${t.participant?.identity ?? "placeholder"}-${t.source}`}
+                  value={t.participant}
+                >
+                  <TrackRefContext.Provider value={t}>
+                    <CustomParticipantTile />
+                  </TrackRefContext.Provider>
+                </ParticipantContext.Provider>
+              ))}
+            </div>
+          ) : (
+            <CarouselLayout tracks={carouselTracks}>
+              <CustomParticipantTile />
+            </CarouselLayout>
+          )}
+          <div
+            ref={screenShareContainerRef}
+            className="group relative flex-1 min-w-0 min-h-0"
+          >
+            <FocusLayout trackRef={screenTrack} />
+            {/* Floating toolbar — slides down from top on hover */}
+            <div
+              className="absolute top-0 left-1/2 -translate-x-1/2 z-50
+                flex items-center gap-0.5 px-2 py-1
+                bg-black/50 backdrop-blur-md rounded-b-xl border border-t-0 border-white/10
+                opacity-0 -translate-y-full group-hover:opacity-100 group-hover:translate-y-0
+                transition-all duration-200 ease-out"
+            >
+              {/* Fullscreen */}
+              <button
+                onClick={() => setIsFullscreen(true)}
+                title="Fullscreen"
+                className="flex items-center justify-center w-7 h-7 rounded-lg text-white/80 hover:text-white hover:bg-white/10 transition-colors cursor-pointer"
+              >
+                <svg
+                  className="w-4 h-4"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth={2}
+                    d="M4 8V4m0 0h4M4 4l5 5M20 8V4m0 0h-4m4 0l-5 5M4 16v4m0 0h4m-4 0l5-5M20 16v4m0 0h-4m4 0l-5-5"
+                  />
+                </svg>
+              </button>
+              {/* PiP */}
+              {document.pictureInPictureEnabled && (
+                <>
+                  <div className="w-px h-3.5 bg-white/20 mx-0.5" />
+                  <button
+                    onClick={togglePiP}
+                    title={isPiP ? "Exit Mini Player" : "Mini Player"}
+                    className={`flex items-center justify-center w-7 h-7 rounded-lg transition-colors cursor-pointer ${
+                      isPiP
+                        ? "text-blue-400 bg-blue-500/20"
+                        : "text-white/80 hover:text-white hover:bg-white/10"
+                    }`}
+                  >
+                    <svg
+                      className="w-4 h-4"
+                      fill="none"
+                      stroke="currentColor"
+                      viewBox="0 0 24 24"
+                    >
+                      <path
+                        strokeLinecap="round"
+                        strokeLinejoin="round"
+                        strokeWidth={2}
+                        d="M15 3h6v6M9 21H3v-6M21 3l-7 7M3 21l7-7"
+                      />
+                    </svg>
+                  </button>
+                </>
+              )}
+            </div>
+          </div>
+        </FocusLayoutContainer>
+      </PinContext.Provider>
+    );
+  }
+
+  // Pinned participant layout (no screen share) — custom flex layout
+  if (pinnedIdentity && pinnedTrack) {
+    const otherTracks = tracks.filter(
+      (t) => t.participant?.identity !== pinnedIdentity,
+    );
     return (
-      <FocusLayoutContainer>
-        <CarouselLayout tracks={tracks}>
-          <CustomParticipantTile />
-        </CarouselLayout>
-        <FocusLayout
-          trackRef={tracks.find((t) => t.source === Track.Source.ScreenShare)}
-        />
-      </FocusLayoutContainer>
+      <PinContext.Provider value={pinContextValue}>
+        <div
+          style={{
+            display: "flex",
+            width: "100%",
+            height: "100%",
+            gap: "8px",
+            padding: "8px",
+            boxSizing: "border-box",
+          }}
+        >
+          {/* Sidebar: other participants */}
+          {otherTracks.length > 0 && (
+            <div
+              style={{
+                width: "170px",
+                minWidth: "170px",
+                display: "flex",
+                flexDirection: "column",
+                overflowY: "auto",
+                gap: "8px",
+              }}
+            >
+              {otherTracks.map((t) => (
+                <div
+                  key={`${t.participant?.identity ?? "placeholder"}-${t.source}`}
+                  style={{ width: "150px", height: "150px", flexShrink: 0 }}
+                >
+                  <ParticipantContext.Provider value={t.participant}>
+                    <TrackRefContext.Provider value={t}>
+                      <CustomParticipantTile />
+                    </TrackRefContext.Provider>
+                  </ParticipantContext.Provider>
+                </div>
+              ))}
+            </div>
+          )}
+          {/* Main: pinned participant */}
+          <div style={{ flex: 1, minWidth: 0, position: "relative" }}>
+            <ParticipantContext.Provider value={pinnedTrack.participant}>
+              <TrackRefContext.Provider value={pinnedTrack}>
+                <CustomParticipantTile />
+              </TrackRefContext.Provider>
+            </ParticipantContext.Provider>
+          </div>
+        </div>
+      </PinContext.Provider>
     );
   }
 
   return (
-    <GridLayout tracks={tracks}>
-      <CustomParticipantTile />
-    </GridLayout>
+    <PinContext.Provider value={pinContextValue}>
+      <GridLayout tracks={tracks}>
+        <CustomParticipantTile />
+      </GridLayout>
+    </PinContext.Provider>
   );
 };
diff --git a/frontend/src/hooks/useLobbyDevices/useAudioDeviceSwitching.ts b/frontend/src/hooks/useLobbyDevices/useAudioDeviceSwitching.ts
index 301df34..43b8d06 100644
--- a/frontend/src/hooks/useLobbyDevices/useAudioDeviceSwitching.ts
+++ b/frontend/src/hooks/useLobbyDevices/useAudioDeviceSwitching.ts
@@ -38,6 +38,11 @@ export function useAudioDeviceSwitching(props: UseAudioSwitchingProps) {
     const updateAudioStream = async () => {
       if (!selectedMic || !micEnabled || !permissionsGranted) return;
 
+      // If the current stream is already using the selected mic, skip restart
+      const currentAudioTrack = stream?.getAudioTracks()[0];
+      const currentMicId = currentAudioTrack?.getSettings()?.deviceId;
+      if (currentMicId === selectedMic) return;
+
       try {
         const constraints: MediaStreamConstraints = {
           video:
diff --git a/frontend/src/hooks/useLobbyDevices/useVideoDeviceSwitching.ts b/frontend/src/hooks/useLobbyDevices/useVideoDeviceSwitching.ts
index 716a037..2a8accd 100644
--- a/frontend/src/hooks/useLobbyDevices/useVideoDeviceSwitching.ts
+++ b/frontend/src/hooks/useLobbyDevices/useVideoDeviceSwitching.ts
@@ -38,6 +38,11 @@ export function useVideoDeviceSwitching(props: UseVideoSwitchingProps) {
     const updateVideoStream = async () => {
       if (!selectedCamera || !cameraEnabled || !permissionsGranted) return;
 
+      // If the current stream is already using the selected camera, skip restart
+      const currentVideoTrack = stream?.getVideoTracks()[0];
+      const currentDeviceId = currentVideoTrack?.getSettings()?.deviceId;
+      if (currentDeviceId === selectedCamera) return;
+
       try {
         const constraints: MediaStreamConstraints = {
           video: {
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 4850649..80f79c3 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -663,7 +663,8 @@
   }
 
   /* Make all carousel items (participants) the same size when screen sharing */
-  .lk-focus-layout .lk-carousel > * {
+  .lk-focus-layout .lk-carousel > *,
+  .lk-focus-layout .lk-carousel-vertical > * {
     @apply w-37.5 h-37.5 min-w-37.5 min-h-37.5 max-w-37.5 max-h-37.5 shrink-0;
     aspect-ratio: auto !important;
   }
@@ -673,15 +674,27 @@
     @apply flex-col overflow-y-auto overflow-x-hidden gap-2 p-2 max-h-full;
   }
 
+  /* Manual ordered carousel (used when a participant is pinned) */
+  .lk-focus-layout .lk-carousel-vertical {
+    @apply flex flex-col overflow-y-auto overflow-x-hidden gap-2 p-2 max-h-full;
+  }
+
   /* Keep the focused track (screen share) large */
   .lk-focus-layout .lk-focused-participant {
     @apply flex-1 w-full h-full;
   }
 
+  /* Hide LiveKit's built-in expand button — we use our own custom fullscreen button */
+  .lk-focus-toggle-button {
+    display: none !important;
+  }
+
   /* Adjust focus layout container to give more space to screen share */
   .lk-focus-layout {
     display: grid !important;
     grid-template-columns: 170px 1fr !important;
+    grid-template-rows: 1fr !important;
+    height: 100% !important;
     @apply gap-2;
   }
 
diff --git a/frontend/src/pages/MeetingLobby/VideoPreview.tsx b/frontend/src/pages/MeetingLobby/VideoPreview.tsx
index e738a4c..0c5ffa5 100644
--- a/frontend/src/pages/MeetingLobby/VideoPreview.tsx
+++ b/frontend/src/pages/MeetingLobby/VideoPreview.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useRef } from "react";
 import MediaControls from "../../components/meeting/MediaControls";
 import type { VideoPreviewProps } from "./types";
 
@@ -10,6 +10,14 @@ export const VideoPreview: React.FC<VideoPreviewProps> = ({
   onToggleMic,
   onToggleCamera,
 }) => {
+  const videoRef = useRef<HTMLVideoElement>(null);
+
+  useEffect(() => {
+    if (videoRef.current) {
+      videoRef.current.srcObject = stream ?? null;
+    }
+  }, [stream]);
+
   return (
     <div
       className="relative aspect-video bg-black"
@@ -18,9 +26,7 @@ export const VideoPreview: React.FC<VideoPreviewProps> = ({
     >
       {cameraEnabled && stream ? (
         <video
-          ref={(video) => {
-            if (video) video.srcObject = stream;
-          }}
+          ref={videoRef}
           autoPlay
           playsInline
           muted