diff --git a/src/components/Course/components/Lesson/Exercise/EditMode.svelte b/src/components/Course/components/Lesson/Exercise/EditMode.svelte
index a0456e0e..3d0d949b 100644
--- a/src/components/Course/components/Lesson/Exercise/EditMode.svelte
+++ b/src/components/Course/components/Lesson/Exercise/EditMode.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { dndzone } from 'svelte-dnd-action';
   import { fly } from 'svelte/transition';
   import {
     questionnaire,
@@ -18,6 +19,7 @@
   // import Subtract24 from "carbon-icons-svelte/lib/Subtract24";
 
   import TextField from '../../../../Form/TextField.svelte';
+  import Modal from '../../../../Modal/index.svelte';
   import TextArea from '../../../../Form/TextArea.svelte';
   import Checkbox from '../../../../Form/Checkbox.svelte';
   import DateTime from '../../../../Form/DateTime.svelte';
@@ -43,11 +45,42 @@
   const extraActions = ['Code Snippets', 'Upload image'];
   const initialQuestionsLength = $questionnaire.questions.length;
 
+  export let editDescription = false;
+
   let errors = {};
   let questionIdToDelete = null;
+  let questions = [];
+  let isDragging = false;
 
-  function shouldScrollToLast(index, questions) {
+  function handleDndConsider(e) {
+    questions = e.detail.items;
+  }
+
+  function handleDndFinalize(e) {
+    const prevQuestionsByOrder = questions.reduce(
+      (acc, l, index) => ({ ...acc, [l.id]: l.order }),
+      {}
+    );
+    questions = e.detail.items;
+
+    // // Only update the lesson order that changed
+    e.detail.items.forEach((item, index) => {
+      const order = index + 1;
+
+      if (order !== prevQuestionsByOrder[item.id]) {
+        $questionnaire.questions.some((q) => {
+          if (q.id === item.id) {
+            q.is_dirty = true;
+            q.order = order;
+          }
+        });
+      }
+    });
+  }
+
+  function shouldScrollToLast(questionId, questions) {
     const currentQuestionsLength = questions.length;
+    const index = questions.findIndex((question) => question.id === questionId);
     const isLast = index + 1 === currentQuestionsLength;
 
     return isLast && initialQuestionsLength !== currentQuestionsLength;
@@ -84,6 +117,7 @@
   }
 
   $: errors = $questionnaireValidation;
+  $: questions = filterOutDeleted($questionnaire.questions);
 </script>
 
 <DeleteConfirmationModal
@@ -91,64 +125,86 @@
   onDelete={onFinalDeleteClicked}
 />
 
-<div class="w-11/12 m-auto">
-  <QuestionContainer isTitle={true}>
-    <TextField
-      placeholder="Title"
-      bind:value={$questionnaire.title}
-      className="mb-2"
-      onChange={() => ($questionnaire.is_title_dirty = true)}
-    />
-    <DateTime
-      label="Due by"
-      className="w-50"
-      value={$questionnaire.due_by}
-      onInput={(e) => {
-        $questionnaire.due_by = e.target.value;
-        $questionnaire.is_due_by_dirty = true;
-      }}
-    />
-    <EditContent
-      writeLabel="Description"
-      bind:value={$questionnaire.description}
-      placeholder="Start typing your lesson"
-      textAreaHeight="100px"
-      onInputChange={() => ($questionnaire.is_description_dirty = true)}
-    />
-  </QuestionContainer>
+<Modal
+  onClose={() => (editDescription = false)}
+  bind:open={editDescription}
+  width="w-2/4"
+  modalHeading="Update description"
+>
+  <div>
+    <QuestionContainer isTitle={true}>
+      <TextField
+        placeholder="Title"
+        bind:value={$questionnaire.title}
+        className="mb-2"
+        onChange={() => ($questionnaire.is_title_dirty = true)}
+      />
+      <DateTime
+        label="Due by"
+        className="w-50"
+        value={$questionnaire.due_by}
+        onInput={(e) => {
+          $questionnaire.due_by = e.target.value;
+          $questionnaire.is_due_by_dirty = true;
+        }}
+      />
+      <EditContent
+        writeLabel="Description"
+        bind:value={$questionnaire.description}
+        placeholder="Start typing your lesson"
+        textAreaHeight="100px"
+        onInputChange={() => ($questionnaire.is_description_dirty = true)}
+      />
+    </QuestionContainer>
+  </div>
+</Modal>
 
+<div class="w-full">
   {#if Object.values(errors).length}
     <div class="w-full flex justify-center mb-4">
       <ErrorMessage message="You have some errors" />
     </div>
   {/if}
+  <div
+    use:dndzone={{
+      items: questions,
+      flipDurationMs: 300,
+      dropTargetStyle: {
+        border: '2px #1d4ed8 solid',
+        'border-style': 'dashed',
+      },
+    }}
+    on:consider={handleDndConsider}
+    on:finalize={handleDndFinalize}
+    class="questions pt-6 px-6"
+  >
+    {#each questions as question (question.id)}
+      <!-- {#key question.id} -->
+      <QuestionContainer
+        onClose={onInitDeleteClicked(question.id)}
+        scrollToQuestion={shouldScrollToLast(
+          question.id,
+          $questionnaire.questions
+        )}
+        bind:points={question.points}
+        hasError={!!errors[question.id]}
+        onPointsChange={() => {
+          question.is_dirty = true;
+        }}
+      >
+        <div class="flex justify-between items-center">
+          <div class="mr-2 w-3/5">
+            <TextField
+              placeholder="Question"
+              bind:value={question.title}
+              isRequired={true}
+              onChange={() => {
+                question.is_dirty = true;
+              }}
+            />
+          </div>
 
-  {#each filterOutDeleted($questionnaire.questions) as question, index}
-    <!-- {#key question.id}
-      <div out:fly={{ x: 500, duration: 1000 }}> -->
-    <QuestionContainer
-      onClose={onInitDeleteClicked(question.id)}
-      scrollToQuestion={shouldScrollToLast(index, $questionnaire.questions)}
-      bind:points={question.points}
-      hasError={!!errors[question.id]}
-      onPointsChange={() => {
-        question.is_dirty = true;
-      }}
-    >
-      <div class="flex justify-between items-center">
-        <div class="mr-2 w-3/5">
-          <TextField
-            placeholder="Question"
-            bind:value={question.title}
-            isRequired={true}
-            onChange={() => {
-              console.log('title changed', question.title);
-              question.is_dirty = true;
-            }}
-          />
-        </div>
-
-        <!-- <Dropdown
+          <!-- <Dropdown
           options={extraActions}
           handleOptionClick={handleOptionClick(question.id)}
         >
@@ -156,120 +212,132 @@
           <p class="ml-2 text-gray-600">Add</p>
         </Dropdown> -->
 
-        <Select
-          bind:value={question.question_type}
-          options={QUESTION_TYPES}
-          onChange={() => {
-            question.is_dirty = true;
-          }}
-        />
-      </div>
-
-      {#if typeof question.code === 'string'}
-        <div class="flex justify-between items-center my-3 w-3/5">
-          <TextArea
-            bind:value={question.code}
-            rows="2"
-            placeholder="Write your code"
+          <Select
+            bind:value={question.question_type}
+            options={QUESTION_TYPES}
+            onChange={() => {
+              question.is_dirty = true;
+            }}
           />
-          <IconButton
-            value="write-code"
-            onClick={() => handleCode(question.id, false)}
-          >
-            <Delete24 class="carbon-icon" />
-          </IconButton>
         </div>
-      {/if}
 
-      <div class="flex flex-col mt-2">
-        {#if QUESTION_TYPE.RADIO === question.question_type.id}
-          {#each filterOutDeleted(question.options) as option}
-            <RadioItem
-              isEditable={true}
-              name={question.title || 'radio-name'}
-              bind:label={option.label}
-              onChange={addDynamicValue(question.id, option.id)}
+        {#if typeof question.code === 'string'}
+          <div class="flex justify-between items-center my-3 w-3/5">
+            <TextArea
+              bind:value={question.code}
+              rows="2"
+              placeholder="Write your code"
+            />
+            <IconButton
+              value="write-code"
+              onClick={() => handleCode(question.id, false)}
             >
-              <div slot="iconbutton" class="flex items-center">
-                <IconButton
-                  value={option.id}
-                  onClick={handleRemoveOption(question.id, option.id)}
-                >
-                  <Delete24 class="carbon-icon" />
-                </IconButton>
-                <IconButton
-                  value={option.id}
-                  onClick={handleAnswerSelect(question.id, option.id)}
-                  buttonClassName={option.is_correct && 'success'}
-                >
-                  {#if option.is_correct}
-                    <CheckmarkFilled24 class="carbon-icon" />
-                  {:else}
-                    <CheckmarkOutline24 class="carbon-icon" />
-                  {/if}
-                </IconButton>
-              </div>
-            </RadioItem>
-          {/each}
+              <Delete24 class="carbon-icon" />
+            </IconButton>
+          </div>
         {/if}
 
-        {#if QUESTION_TYPE.CHECKBOX === question.question_type.id}
-          {#each filterOutDeleted(question.options) as option}
-            <Checkbox
-              isEditable={true}
-              name={question || 'checkbox-name'}
-              bind:label={option.label}
-              onChange={addDynamicValue(question.id, option.id)}
-            >
-              <div slot="iconbutton" class="flex items-center">
-                <IconButton
-                  value={option.id}
-                  onClick={handleRemoveOption(question.id, option.id)}
-                >
-                  <Delete24 class="carbon-icon" />
-                </IconButton>
-                <IconButton
-                  value={option.id}
-                  onClick={handleAnswerSelect(question.id, option.id)}
-                  buttonClassName={option.is_correct && 'success'}
-                >
-                  {#if option.is_correct}
-                    <CheckmarkFilled24 class="carbon-icon" />
-                  {:else}
-                    <CheckmarkOutline24 class="carbon-icon" />
-                  {/if}
-                </IconButton>
-              </div>
-            </Checkbox>
-          {/each}
-        {/if}
+        <div class="flex flex-col mt-2">
+          {#if QUESTION_TYPE.RADIO === question.question_type.id}
+            {#each filterOutDeleted(question.options) as option}
+              <RadioItem
+                isEditable={true}
+                name={question.title || 'radio-name'}
+                bind:label={option.label}
+                onChange={addDynamicValue(question.id, option.id)}
+              >
+                <div slot="iconbutton" class="flex items-center">
+                  <IconButton
+                    value={option.id}
+                    onClick={handleRemoveOption(question.id, option.id)}
+                  >
+                    <Delete24 class="carbon-icon" />
+                  </IconButton>
+                  <IconButton
+                    value={option.id}
+                    onClick={handleAnswerSelect(question.id, option.id)}
+                    buttonClassName={option.is_correct && 'success'}
+                  >
+                    {#if option.is_correct}
+                      <CheckmarkFilled24 class="carbon-icon" />
+                    {:else}
+                      <CheckmarkOutline24 class="carbon-icon" />
+                    {/if}
+                  </IconButton>
+                </div>
+              </RadioItem>
+            {/each}
+          {/if}
 
-        {#if QUESTION_TYPE.TEXTAREA === question.question_type.id}
-          <TextArea bind:value={question.value} />
-        {/if}
+          {#if QUESTION_TYPE.CHECKBOX === question.question_type.id}
+            {#each filterOutDeleted(question.options) as option}
+              <Checkbox
+                isEditable={true}
+                name={question || 'checkbox-name'}
+                bind:label={option.label}
+                onChange={addDynamicValue(question.id, option.id)}
+              >
+                <div slot="iconbutton" class="flex items-center">
+                  <IconButton
+                    value={option.id}
+                    onClick={handleRemoveOption(question.id, option.id)}
+                  >
+                    <Delete24 class="carbon-icon" />
+                  </IconButton>
+                  <IconButton
+                    value={option.id}
+                    onClick={handleAnswerSelect(question.id, option.id)}
+                    buttonClassName={option.is_correct && 'success'}
+                  >
+                    {#if option.is_correct}
+                      <CheckmarkFilled24 class="carbon-icon" />
+                    {:else}
+                      <CheckmarkOutline24 class="carbon-icon" />
+                    {/if}
+                  </IconButton>
+                </div>
+              </Checkbox>
+            {/each}
+          {/if}
 
-        {#if getQuestionErrorMsg(errors, question, 'option')}
-          <ErrorMessage
-            message={getQuestionErrorMsg(errors, question, 'option')}
-          />
-        {/if}
-      </div>
+          {#if QUESTION_TYPE.TEXTAREA === question.question_type.id}
+            <TextArea bind:value={question.value} />
+          {/if}
 
-      {#if QUESTION_TYPE.TEXTAREA !== question.question_type.id}
-        <div class="flex items-center mt-3">
-          <PrimaryButton
-            disablePadding={true}
-            className="p-2"
-            variant={VARIANTS.OUTLINED}
-            onClick={handleAddOption(question.id)}
-          >
-            <AddFilled24 class="carbon-icon" />
-            <p class="ml-2">Add option</p>
-          </PrimaryButton>
+          {#if getQuestionErrorMsg(errors, question, 'option')}
+            <ErrorMessage
+              message={getQuestionErrorMsg(errors, question, 'option')}
+            />
+          {/if}
         </div>
-      {/if}
-    </QuestionContainer>
-    <!-- </div>
-    {/key} -->
-  {/each}
+
+        {#if QUESTION_TYPE.TEXTAREA !== question.question_type.id}
+          <div class="flex items-center mt-3">
+            <PrimaryButton
+              disablePadding={true}
+              className="p-2"
+              variant={VARIANTS.OUTLINED}
+              onClick={handleAddOption(question.id)}
+            >
+              <AddFilled24 class="carbon-icon" />
+              <p class="ml-2">Add option</p>
+            </PrimaryButton>
+          </div>
+        {/if}
+      </QuestionContainer>
+
+      <!--  {/key} -->
+    {/each}
+  </div>
 </div>
+
+<style>
+  .questions {
+    height: 80vh;
+    overflow-y: auto;
+  }
+
+  :global(#dnd-action-dragged-el div) {
+    z-index: 100;
+  }
+</style>
diff --git a/src/components/Course/components/Lesson/Exercise/ViewMode.svelte b/src/components/Course/components/Lesson/Exercise/ViewMode.svelte
index 33f48761..816b2c3c 100644
--- a/src/components/Course/components/Lesson/Exercise/ViewMode.svelte
+++ b/src/components/Course/components/Lesson/Exercise/ViewMode.svelte
@@ -91,7 +91,7 @@
 
   function getTotalPossibleGrade() {
     return $questionnaire.questions.reduce((acc, question) => {
-      acc += parseInt(question.points, 10);
+      acc += parseFloat(question.points, 10);
       return acc;
     }, 0);
   }
diff --git a/src/components/Course/components/Lesson/Exercise/index.svelte b/src/components/Course/components/Lesson/Exercise/index.svelte
index 3fd09872..2cd5f823 100644
--- a/src/components/Course/components/Lesson/Exercise/index.svelte
+++ b/src/components/Course/components/Lesson/Exercise/index.svelte
@@ -1,6 +1,10 @@
 <script>
   import { onDestroy } from 'svelte';
-  import AddAlt16 from 'carbon-icons-svelte/lib/AddAlt16';
+  import AddAlt24 from 'carbon-icons-svelte/lib/AddAlt24';
+  import Delete24 from 'carbon-icons-svelte/lib/Delete24';
+  import Settings24 from 'carbon-icons-svelte/lib/Settings24';
+  import View32 from 'carbon-icons-svelte/lib/View32';
+  import ViewFilled32 from 'carbon-icons-svelte/lib/ViewFilled32';
   import {
     handleAddQuestion,
     questionnaire,
@@ -9,6 +13,7 @@
   } from '../store/exercise';
   import PrimaryButton from '../../../../PrimaryButton/index.svelte';
   import PageBody from '../../../../PageBody/index.svelte';
+  import IconButton from '../../../../IconButton/index.svelte';
   import RoleBasedSecurity from '../../../../RoleBasedSecurity/index.svelte';
   import ViewMode from './ViewMode.svelte';
   import EditMode from './EditMode.svelte';
@@ -21,6 +26,7 @@
 
   let mode = MODES.view;
   let preview = false;
+  let editDescription = false;
 
   async function handleMode() {
     if (mode === MODES.edit) {
@@ -47,6 +53,8 @@
     }
   }
 
+  function handleDeleteExercise() {}
+
   function onCancel() {
     mode = MODES.view;
     refetchExercise();
@@ -57,7 +65,7 @@
   });
 </script>
 
-<PageBody>
+<PageBody padding="px-4">
   <svelte:fragment slot="header">
     <div class="flex items-center">
       <RoleBasedSecurity allowedRoles="[1,2]">
@@ -78,25 +86,48 @@
       </RoleBasedSecurity>
 
       {#if mode !== MODES.edit}
-        <PrimaryButton
-          variant={preview ? VARIANTS.CONTAINED : VARIANTS.OUTLINED}
-          label={'Toggle Preview'}
+        <IconButton
           onClick={() => (preview = !preview)}
-        />
+          toolTipProps={{ title: 'Toggle preview', direction: 'right' }}
+          selected={preview}
+          contained={true}
+        >
+          {#if preview}
+            <ViewFilled32 class="carbon-icon" />
+          {:else}
+            <View32 class="carbon-icon" />
+          {/if}
+        </IconButton>
       {/if}
     </div>
 
     {#if mode === MODES.edit}
       <div class="flex items-center">
-        <PrimaryButton variant={VARIANTS.OUTLINED} onClick={handleAddQuestion}>
-          Add Question <AddAlt16 class="carbon-icon" />
-        </PrimaryButton>
+        <IconButton
+          onClick={() => (editDescription = true)}
+          toolTipProps={{ title: 'Edit description', direction: 'bottom' }}
+        >
+          <Settings24 class="carbon-icon" />
+        </IconButton>
+        <!-- <IconButton
+          onClick={handleDeleteExercise}
+          toolTipProps={{ title: 'Delete questionnaire', direction: 'bottom' }}
+        >
+          <Delete24 class="carbon-icon" />
+        </IconButton> -->
+
+        <IconButton
+          onClick={handleAddQuestion}
+          toolTipProps={{ title: 'Add question', direction: 'bottom' }}
+        >
+          <AddAlt24 class="carbon-icon" />
+        </IconButton>
       </div>
     {/if}
   </svelte:fragment>
 
   {#if mode === MODES.edit && !preview}
-    <EditMode />
+    <EditMode bind:editDescription />
   {:else}
     <ViewMode {preview} {exerciseId} />
   {/if}
diff --git a/src/components/Course/components/Lesson/Exercises/index.svelte b/src/components/Course/components/Lesson/Exercises/index.svelte
index 845ef763..325dffc7 100644
--- a/src/components/Course/components/Lesson/Exercises/index.svelte
+++ b/src/components/Course/components/Lesson/Exercises/index.svelte
@@ -86,6 +86,7 @@
       );
       return question;
     });
+    data.questions = data.questions.sort((a, b) => a.order - b.order);
 
     data.is_title_dirty = false;
     data.is_description_dirty = false;
diff --git a/src/components/PageBody/index.svelte b/src/components/PageBody/index.svelte
index 61285b80..f597bb71 100644
--- a/src/components/PageBody/index.svelte
+++ b/src/components/PageBody/index.svelte
@@ -9,7 +9,7 @@
 <div class="root mt-4 mx-auto {width} {className} relative {padding}">
   {#if $$slots.header}
     <div
-      class="head flex items-center justify-between sticky right-0 w-full py-3"
+      class="head flex items-center justify-between sticky right-0 w-full p-3"
     >
       <slot name="header" />
     </div>
@@ -21,7 +21,7 @@
 <style>
   .root {
     overflow-y: auto;
-    height: 85vh;
+    height: 90vh;
   }
   .head {
     top: 0px;
diff --git a/src/components/QuestionContainer/index.svelte b/src/components/QuestionContainer/index.svelte
index 89d870b5..9db67f9e 100644
--- a/src/components/QuestionContainer/index.svelte
+++ b/src/components/QuestionContainer/index.svelte
@@ -29,15 +29,15 @@
 
 <div
   bind:this={ref}
-  class="{isTitle ? 'border' : 'border-2'} {hasError
+  class="bg-white border {hasError
     ? 'border-red-700'
-    : 'border-gray hover:border-blue-700'} border-r-2 rounded-md mb-6 relative root"
+    : 'border-gray hover:border-blue-700'} rounded-md mb-6 relative root"
 >
   {#if isTitle}
     <div class="title absolute bg-blue-700" />
   {/if}
 
-  {#if onClose}
+  {#if onClose && !isTitle}
     <div class="close-button hidden absolute -top-6 -right-6">
       <CloseButton onClick={onClose} contained={true} />
     </div>
diff --git a/src/components/ToolTip/index.svelte b/src/components/ToolTip/index.svelte
index 780e4dae..5f7cec30 100644
--- a/src/components/ToolTip/index.svelte
+++ b/src/components/ToolTip/index.svelte
@@ -6,7 +6,15 @@
 
 {#if !!title}
   <div class="tooltip">
-    <span class="tooltiptext z-20 {direction === 'right' && 'right'}">
+    <span
+      class="tooltiptext z-20 {direction === 'right'
+        ? 'right'
+        : direction === 'top'
+        ? 'top'
+        : direction === 'bottom'
+        ? 'bottom'
+        : 'left'}"
+    >
       {title}
       {#if Array.isArray(hotkeys) && hotkeys.length}
         <span class="shortcut">
@@ -29,11 +37,17 @@
     left: 100%;
     right: unset !important;
   }
+  .bottom {
+    bottom: -75% !important;
+    left: -80%;
+    right: unset !important;
+    top: unset !important;
+  }
   .tooltip .tooltiptext {
     color: #fff;
     padding: 8px;
     font-size: 0.625rem;
-    font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+    font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
     font-weight: 500;
     line-height: 1.4em;
     border-radius: 8px;
diff --git a/src/utils/services/courses/index.js b/src/utils/services/courses/index.js
index 2a396d46..77c6631f 100644
--- a/src/utils/services/courses/index.js
+++ b/src/utils/services/courses/index.js
@@ -205,6 +205,7 @@ export async function upsertExercise(questionnaire, exerciseId) {
       question_type,
       options,
       deleted_at,
+      order,
       points,
       is_dirty,
     } = question;
@@ -239,6 +240,7 @@ export async function upsertExercise(questionnaire, exerciseId) {
       name: isNew(id) ? undefined : name,
       title,
       points,
+      order,
       question_type_id: question_type.id,
       exercise_id: exerciseId,
     };
@@ -256,7 +258,7 @@ export async function upsertExercise(questionnaire, exerciseId) {
     }
 
     if (questionSupabaseRes) {
-      const { question_type_id, id, name } = questionSupabaseRes;
+      const { question_type_id, id, name, order } = questionSupabaseRes;
 
       // Delete cause this is not a field in the table
       delete newQuestion.question_type_id;
@@ -264,6 +266,7 @@ export async function upsertExercise(questionnaire, exerciseId) {
       newQuestion.question_type = { id: question_type_id };
       newQuestion.id = id;
       newQuestion.name = name;
+      newQuestion.order = order;
       newQuestion.options = [];
 
       // Don't map options for 'Paragraph' questions