diff --git a/bsg-frontend/apps/extension/pages/_app.tsx b/bsg-frontend/apps/extension/pages/_app.tsx
index 08889f4..cf6a33b 100644
--- a/bsg-frontend/apps/extension/pages/_app.tsx
+++ b/bsg-frontend/apps/extension/pages/_app.tsx
@@ -9,13 +9,24 @@ import { faPaperPlane, faSmile, faCopy } from '@fortawesome/free-solid-svg-icons
 import { faGoogle } from '@fortawesome/free-brands-svg-icons'
 import RoomChoice from './room-choice'
 import { useChatSocket } from '../hooks/useChatSocket'
+import DefaultPopup  from './defaultPopup'
 
 const poppins = Poppins({ weight: '400', subsets: ['latin'] })
 
 
 export default function App({ Component, pageProps }: AppProps) {
+    const isDefaultPopup = Component === DefaultPopup
+
+    if(isDefaultPopup){
+        return (
+            <div className={poppins.className}>
+                <Component {...pageProps} />
+            </div>
+        )
+    }
 
   return (
+    //Implement Scrollbar code here 
     <div className={poppins.className}>
       <Component  {...pageProps} />
     </div>
diff --git a/docker-compose.yml b/docker-compose.yml
index dfcef09..63854e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,6 +108,8 @@ services:
     # image: bsg-server
     ports:
       - 3001:3000
+    depends_on:
+      - redis-cache
     environment:
       - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
       - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
diff --git a/server/src/index.js b/server/src/index.js
index 4dea7ab..9369d26 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -113,6 +113,11 @@ async function startServer() {
         }
     });
 
+    const submissionRoutes = require('./routes/submission');
+    app.use('/submission', submissionRoutes);
+
+    const roomsRoutes = require('./routes/rooms');
+    app.use('/rooms', roomsRoutes);
 
     app.listen(port, () => {
         console.log(`Server listening on port ${port}`);
diff --git a/server/src/routes/room.js b/server/src/routes/room.js
new file mode 100644
index 0000000..ce9e040
--- /dev/null
+++ b/server/src/routes/room.js
@@ -0,0 +1,6 @@
+const express = require('express')
+const router = express.Router();
+
+router.get('/room:id', (req, res) => {
+    res.send("This is the room")
+})
\ No newline at end of file