diff --git a/app/Http/Controllers/Backend/Quizzes/QuestionController.php b/app/Http/Controllers/Backend/Quizzes/QuestionController.php
index ecfaf06..fe04ccc 100644
--- a/app/Http/Controllers/Backend/Quizzes/QuestionController.php
+++ b/app/Http/Controllers/Backend/Quizzes/QuestionController.php
@@ -68,7 +68,7 @@ public function edit($id)
     {
         $quiz = Quiz::get();
         $question = Question::findOrFail(encryptor('decrypt',$id));
-        return view('backend.quiz.question.create', compact('quiz'));
+        return view('backend.quiz.question.edit', compact('quiz', 'question'));
     }
 
     /**
diff --git a/resources/views/backend/layouts/app.blade.php b/resources/views/backend/layouts/app.blade.php
index 9282c53..444b1ef 100644
--- a/resources/views/backend/layouts/app.blade.php
+++ b/resources/views/backend/layouts/app.blade.php
@@ -245,7 +245,7 @@ class="las la-chalkboard-teacher"></i>Instructors</a>
                         </a>
                         <ul aria-expanded="false">
                             <li><a href="{{route('quiz.index')}}"><i class="las la-circle"></i>All Quizzes</a></li>
-                            <li><a href="javascript:void()"><i class="las la-circle"></i>Questions</a></li>
+                            <li><a href="{{route('question.index')}}"><i class="las la-circle"></i>Questions</a></li>
                             <li><a href="javascript:void()"><i class="las la-circle"></i>Answers</a></li>
                         </ul>
                     </li>
diff --git a/resources/views/backend/quiz/question/create.blade.php b/resources/views/backend/quiz/question/create.blade.php
index ec83bb2..d3532a5 100644
--- a/resources/views/backend/quiz/question/create.blade.php
+++ b/resources/views/backend/quiz/question/create.blade.php
@@ -43,9 +43,9 @@
                                     <div class="form-group">
                                         <label class="form-label">Quiz</label>
                                         <select class="form-control" name="quizId">
-                                            @forelse ($short_answer as $q)
+                                            @forelse ($quiz as $q)
                                             <option value="{{$q->id}}" {{old('quizId')==$q->id?'selected':''}}>
-                                                {{$q->quizTitle}}</option>
+                                                {{$q->title}}</option>
                                             @empty
                                             <option value="">No Quiz Found</option>
                                             @endforelse
diff --git a/resources/views/backend/quiz/question/edit.blade.php b/resources/views/backend/quiz/question/edit.blade.php
index ea3c060..1de7ea1 100644
--- a/resources/views/backend/quiz/question/edit.blade.php
+++ b/resources/views/backend/quiz/question/edit.blade.php
@@ -1,5 +1,5 @@
 @extends('backend.layouts.app')
-@section('title', 'Edit Course Material Material')
+@section('title', 'Edit Question')
 
 @push('styles')
 <!-- Pick date -->
@@ -16,14 +16,14 @@
         <div class="row page-titles mx-0">
             <div class="col-sm-6 p-md-0">
                 <div class="welcome-text">
-                    <h4>Edit Course Material</h4>
+                    <h4>Edit Question</h4>
                 </div>
             </div>
             <div class="col-sm-6 p-md-0 justify-content-sm-end mt-2 mt-sm-0 d-flex">
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{route('dashboard')}}">Home</a></li>
-                    <li class="breadcrumb-item active"><a href="{{route('material.index')}}">Course Materials</a></li>
-                    <li class="breadcrumb-item active"><a href="javascript:void(0);">Edit Course Material</a></li>
+                    <li class="breadcrumb-item active"><a href="{{route('question.index')}}">Questions</a></li>
+                    <li class="breadcrumb-item active"><a href="javascript:void(0);">Edit Question</a></li>
                 </ol>
             </div>
         </div>
@@ -35,66 +35,56 @@
                         <h5 class="card-title">Basic Info</h5>
                     </div>
                     <div class="card-body">
-                        <form action="{{route('material.update',encryptor('encrypt', $material->id))}}" method="post"
+                        <form action="{{route('question.update',encryptor('encrypt', $question->id))}}" method="post"
                             enctype="multipart/form-data">
                             @csrf
                             @method('PATCH')
-                            <input type="hidden" name="uptoken" value="{{encryptor('encrypt',$material->id)}}">
+                            <input type="hidden" name="uptoken" value="{{encryptor('encrypt',$question->id)}}">
                             <div class="row">
                                 <div class="col-lg-6 col-md-6 col-sm-12">
                                     <div class="form-group">
-                                        <label class="form-label">Title</label>
-                                        <input type="text" class="form-control" name="materialTitle"
-                                            value="{{old('materialTitle',$material->title)}}">
-                                    </div>
-                                    @if($errors->has('materialTitle'))
-                                    <span class="text-danger"> {{ $errors->first('materialTitle') }}</span>
-                                    @endif
-                                </div>
-                                <div class="col-lg-6 col-md-6 col-sm-12">
-                                    <div class="form-group">
-                                        <label class="form-label">Course</label>
-                                        <select class="form-control" name="courseId">
-                                            @forelse ($course as $c)
-                                            <option value="{{$c->id}}" {{old('courseId', $material->course_id) ==
-                                                $c->id?'selected':''}}>
-                                                {{$c->title_en}}</option>
+                                        <label class="form-label">Quiz</label>
+                                        <select class="form-control" name="quizId">
+                                            @forelse ($quiz as $q)
+                                            <option value="{{$q->id}}" {{old('quizId', $question->quiz_id) ==
+                                                $q->id?'selected':''}}>
+                                                {{$q->title}}</option>
                                             @empty
-                                            <option value="">No Course Material Material Found</option>
+                                            <option value="">No Quiz Found</option>
                                             @endforelse
                                         </select>
                                     </div>
-                                    @if($errors->has('courseId'))
-                                    <span class="text-danger"> {{ $errors->first('courseId') }}</span>
+                                    @if($errors->has('quizId'))
+                                    <span class="text-danger"> {{ $errors->first('quizId') }}</span>
                                     @endif
                                 </div>
                                 <div class="col-lg-6 col-md-6 col-sm-12">
                                     <div class="form-group">
-                                        <label class="form-label">Material Type</label>
-                                        <select class="form-control" name="materialType">
-                                            <option value="video" @if(old('materialType', $material->type)=='video' ) selected
-                                                @endif>Video
+                                        <label class="form-label">Qestion Type</label>
+                                        <select class="form-control" name="questionType">
+                                            <option value="video" @if(old('questionType', $question->type)=='video' ) selected
+                                                @endif>Multiple Choice
                                             </option>
-                                            <option value="document" @if(old('materialType', $material->type)=='document' ) selected
-                                                @endif>Document
+                                            <option value="true_false" @if(old('questionType', $question->type)=='true_false' ) selected
+                                                @endif>True False
                                             </option>
-                                            <option value="quiz" @if(old('materialType', $material->type)
-                                                =='quiz' )
-                                                selected @endif>Quiz</option>
+                                            <option value="short_answer" @if(old('questionType', $question->type)
+                                                =='short_answer' )
+                                                selected @endif>Short Answer</option>
                                         </select>
                                     </div>
-                                    @if($errors->has('materialType'))
-                                    <span class="text-danger"> {{ $errors->first('materialType') }}</span>
+                                    @if($errors->has('questionType'))
+                                    <span class="text-danger"> {{ $errors->first('questionType') }}</span>
                                     @endif
                                 </div>
                                 <div class="col-lg-6 col-md-6 col-sm-12">
                                     <div class="form-group">
-                                        <label class="form-label">Content Url</label>
+                                        <label class="form-label">Question Content</label>
                                         <textarea class="form-control"
-                                            name="contentURL">{{old('contentURL',$material->content_url)}}</textarea>
+                                            name="questionContent">{{old('questionContent',$question->content)}}</textarea>
                                     </div>
-                                    @if($errors->has('contentURL'))
-                                    <span class="text-danger"> {{ $errors->first('contentURL') }}</span>
+                                    @if($errors->has('questionContent'))
+                                    <span class="text-danger"> {{ $errors->first('questionContent') }}</span>
                                     @endif
                                 </div>
                                 <div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/resources/views/backend/quiz/question/index.blade.php b/resources/views/backend/quiz/question/index.blade.php
index d9d864c..94299e6 100644
--- a/resources/views/backend/quiz/question/index.blade.php
+++ b/resources/views/backend/quiz/question/index.blade.php
@@ -67,7 +67,7 @@ class="nav-link btn-primary">Grid
                                                     {{ $q->type == 'multiple_choice' ? __('Multiple Choice') : ($q->type == 'true_false' ?
                                                     __('True False') : __('Short Answer')) }}
                                                 </td>
-                                                <td>{{$q->questionContent}}</td>
+                                                <td>{{$q->content}}</td>
                                                 <td>
                                                     <a href="{{route('question.edit', encryptor('encrypt',$q->id))}}"
                                                         class="btn btn-sm btn-primary" title="Edit"><i
diff --git a/routes/web.php b/routes/web.php
index 0c06f54..e623e69 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,7 @@
 use App\Http\Controllers\Backend\Courses\CourseController as course;
 use App\Http\Controllers\Backend\Courses\MaterialController as material;
 use App\Http\Controllers\Backend\Quizzes\QuizController as quiz;
+use App\Http\Controllers\Backend\Quizzes\QuestionController as question;
 
 /*
 |--------------------------------------------------------------------------
@@ -45,6 +46,7 @@
     Route::resource('course', course::class);
     Route::resource('material', material::class);
     Route::resource('quiz', quiz::class);
+    Route::resource('question', question::class);
     Route::get('permission/{role}', [permission::class, 'index'])->name('permission.list');
     Route::post('permission/{role}', [permission::class, 'save'])->name('permission.save');
 });