diff --git a/__tests__/create-survey/page.spec.tsx b/__tests__/create-survey/page.spec.tsx
deleted file mode 100644
index dca4206..0000000
--- a/__tests__/create-survey/page.spec.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import CreateSurvey from '@/app/create-survey/page';
-
-describe('Home', () => {
-    it('should renders a survey name input element', async () => {
-        render(<CreateSurvey />)
-
-        const surveyNameInput = await screen.findByTestId("survey-name-input") as HTMLInputElement;
-
-        expect(surveyNameInput).toBeInTheDocument()
-        expect(surveyNameInput).toHaveAttribute('type', 'text')
-        expect(surveyNameInput.value).toBe('Survey App')
-    });
-});
diff --git a/app/create-survey/components/SingleChoice/index.tsx b/app/create-survey/components/SingleChoice/index.tsx
index aff4181..0db4c06 100644
--- a/app/create-survey/components/SingleChoice/index.tsx
+++ b/app/create-survey/components/SingleChoice/index.tsx
@@ -37,7 +37,6 @@ const SingleChoice = ({ choices, setChoices, setAnswer }: SingleChoiceProps) =>
           <label className='flex gap-x-3'>
             <input
               onChange={() => {
-                console.log('hi')
                 setAnswer && setAnswer(choice)
               }}
               type='radio'
diff --git a/app/create-survey/page.tsx b/app/create-survey/page.tsx
index f952d83..891400a 100644
--- a/app/create-survey/page.tsx
+++ b/app/create-survey/page.tsx
@@ -5,8 +5,11 @@ import QuestionsSlide from './components/QuestionSlide'
 import './style.css'
 import { Question, QuestionType } from '../models/types'
 import { useAppContext } from '../context/AppContext'
+import { useRouter } from 'next/navigation'
 
 export default function CreateSurvey() {
+  const router = useRouter()
+
   const emptyQuestion = { question: '', type: QuestionType.NOT_DECIDED }
   const {
     addNewQuestion,
@@ -52,7 +55,8 @@ export default function CreateSurvey() {
       })
     })
     const data = await res.json()
-    console.log(data)
+    const surveyId = data['survey-id']
+    if (surveyId !== undefined && surveyId !== null) router.push(`/survey/live/${surveyId}`)
   }
 
   const editSurveyName = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -62,7 +66,13 @@ export default function CreateSurvey() {
   return (
     <main className='flex flex-col h-screen'>
       <nav className='flex justify-center p-3'>
-        <input type='text' className='text-2xl bg-transparent outline-none text-center' value={name} onChange={editSurveyName} data-testid="survey-name-input" />
+        <input
+          type='text'
+          className='text-2xl bg-transparent outline-none text-center'
+          value={name}
+          onChange={editSurveyName}
+          data-testid='survey-name-input'
+        />
       </nav>
       <section className='flex justify-between items-center h-full'>
         <button
@@ -83,4 +93,4 @@ export default function CreateSurvey() {
       </footer>
     </main>
   )
-}
\ No newline at end of file
+}
diff --git a/app/survey/[id]/page.tsx b/app/survey/[id]/page.tsx
index ca19af9..0860f9d 100644
--- a/app/survey/[id]/page.tsx
+++ b/app/survey/[id]/page.tsx
@@ -1,16 +1,14 @@
 'use client'
-import { useParams } from 'next/navigation'
 import { useEffect } from 'react'
 import AnswerForm from './components/AnswerForm'
 import LoadingSpinner from '@/app/components/LoadingSpinner'
 import { useAppContext } from '@/app/context/AppContext'
 
-export default function FillSurvey() {
+export default function FillSurvey({ params }: { params: { id: string } }) {
   const { setName, setQuestions, questions, name, currentQuestionNumber } = useAppContext()
-  const { id } = useParams()
 
   const getSurvey = async () => {
-    const res = await fetch(`/survey/${id}/api`)
+    const res = await fetch(`/survey/${params.id}/api`)
     const data = await res.json()
     setName(data.surveyName)
     setQuestions([...data.questions])
diff --git a/app/survey/live/[id]/page.tsx b/app/survey/live/[id]/page.tsx
new file mode 100644
index 0000000..e3156c5
--- /dev/null
+++ b/app/survey/live/[id]/page.tsx
@@ -0,0 +1,12 @@
+import Link from 'next/link'
+
+export default function SurveyLivePage({ params }: { params: { id: string } }) {
+  return (
+    <main className='h-screen flex flex-col gap-y-5 items-center justify-center'>
+      <h1 className='text-white text-5xl'>Your survey is Live</h1>
+      <Link href={`/survey/${params.id}`} className='btn-primary'>
+        Here
+      </Link>
+    </main>
+  )
+}