diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
index 1ace456..8cfec95 100644
--- a/apps/web/app/layout.tsx
+++ b/apps/web/app/layout.tsx
@@ -18,7 +18,7 @@ export default function RootLayout({
 }): JSX.Element {
   return (
     <html lang="en" className={GeistSans.className}>
-      <body className="dark relative flex h-screen flex-col ">
+      <body className="dark relative flex h-auto flex-col ">
         <Header />
         <Image
           src="/light-ray.svg"
diff --git a/apps/web/app/room/queue/page.tsx b/apps/web/app/room/queue/page.tsx
index 399cbcc..a68ef62 100644
--- a/apps/web/app/room/queue/page.tsx
+++ b/apps/web/app/room/queue/page.tsx
@@ -87,16 +87,15 @@ export default function Page(): JSX.Element {
   }, [])
 
   return (
-    <main className="flex h-full flex-col">
-      <section className="align-center container flex h-full place-content-center content-center justify-center">
+    <main className="flex h-auto flex-col">
+      <section className="align-center container mb-5 flex h-full place-content-center content-center justify-center">
         <div>
           <h1 className="text-[2em]">Before you start practicing, make sure to check your microphone and camera first.</h1>
           <Badge>
             Users Online: {usersOnline}
           </Badge>
-          <div className="mt-8 flex flex-col justify-center">
-            <div className="flex w-full flex-col items-center p-5">
-              <Card className="border-slate-5 bg-slate-6 w-3/4 border border-b-0 pt-6">
+            <div className="mt-8 flex w-full flex-col items-center sm:p-5">
+              <Card className="border-slate-5 bg-slate-6 w-full border border-b-0 pt-6 sm:w-3/4">
                 <CardContent>
                   {accessGranted ? (
                     <>
@@ -113,18 +112,18 @@ export default function Page(): JSX.Element {
                         videoOff={videoOff}
                         onVideoOff={toggleVideo}
                       />
-                      <div className="mt-6 flex h-12 w-full items-center justify-between">
-                        <h2 className="text-slate-500">
+                      <div className="mt-6 flex w-full items-center justify-between">
+                        <h2 className="mt-2 text-sm text-slate-500 sm:mt-0 sm:text-base">
                           {"Each conversation room lasts for 10 minutes. When there are less than 2 minutes remaining, a timer will appear above the users' videos to indicate the time left."}
                         </h2>
                       </div>
-                      <div className="mt-2 flex h-12 w-full items-center justify-between gap-6">
-                        <h2>
+                      <div className="mt-2 flex w-full flex-col items-center justify-between gap-6 sm:flex-row">
+                        <h2 className="text-sm sm:text-base">
                           {inQueue
                             ? "Finding a practice buddy"
                             : "Hit the 'Ready' button when you feel ready to start practicing with someone."}
                         </h2>
-                        <Button onClick={onConnect} className="z-10 rounded-xl">
+                        <Button onClick={onConnect} className="z-10 w-full rounded-xl sm:w-auto">
                           {inQueue ? "Cancel" : "I'm Ready"}
                         </Button>
                       </div>
@@ -139,7 +138,6 @@ export default function Page(): JSX.Element {
               </Card>
             </div>
           </div>
-        </div>
       </section>
     </main>
   );
diff --git a/apps/web/components/video-player.tsx b/apps/web/components/video-player.tsx
index c9f4e14..bbdbd25 100644
--- a/apps/web/components/video-player.tsx
+++ b/apps/web/components/video-player.tsx
@@ -37,7 +37,7 @@ export const VideoPlayer = forwardRef<HTMLVideoElement, VideoPlayer>(({
 }, videoRef) => {
     return (
       <>
-        <div className="m-0 size-full min-w-[400px] max-w-[900px] overflow-hidden">
+        <div className="m-0 size-full w-full max-w-[900px] overflow-hidden">
           <div className="relative flex flex-col items-center">
             <video
               className={clsx("rounded-lg w-full ", { '[transform:scaleX(-1)]': !remote})}
@@ -63,9 +63,9 @@ export const VideoPlayer = forwardRef<HTMLVideoElement, VideoPlayer>(({
           </div>
           {!remote && (
             <div className="mt-5 flex justify-center">
-              <div className="flex w-fit gap-6">
+              <div className="flex w-full flex-col gap-2 sm:flex-row md:w-fit md:gap-6">
                 <Select onValueChange={setActiveAudioDevice} value={activeAudioDevice}>
-                  <SelectTrigger className="w-[200px]">
+                  <SelectTrigger className="w-full sm:max-w-48">
                     <Mic size={18} /><SelectValue placeholder="Audio" />
                   </SelectTrigger>
                   <SelectContent>
@@ -83,7 +83,7 @@ export const VideoPlayer = forwardRef<HTMLVideoElement, VideoPlayer>(({
                   </SelectContent>
                 </Select>
                 <Select onValueChange={setActiveVideoDevice} value={activeVideoDevice}>
-                  <SelectTrigger className="w-[180px]">
+                  <SelectTrigger className="w-full sm:max-w-48">
                     <Video size={18} /> <SelectValue placeholder="Video" />
                   </SelectTrigger>
                   <SelectContent>
