diff --git a/.github/workflows/deploy-supabase-on-push.yml b/.github/workflows/deploy-supabase-on-push.yml
new file mode 100644
index 00000000..42647503
--- /dev/null
+++ b/.github/workflows/deploy-supabase-on-push.yml
@@ -0,0 +1,26 @@
+name: Deploy Supabase on Push
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    env:
+      SUPABASE_ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+      SUPABASE_DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+      PROJECT_ID: tapaozmyjsuykgerrfkt
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: supabase/setup-cli@v1
+        with:
+          version: latest
+
+      - run: supabase link --project-ref $PROJECT_ID
+      - run: supabase db push
diff --git a/apps/dashboard/src/app.postcss b/apps/dashboard/src/app.postcss
index e020804b..dc14774b 100644
--- a/apps/dashboard/src/app.postcss
+++ b/apps/dashboard/src/app.postcss
@@ -127,6 +127,14 @@ code {
   overflow-y: auto;
 }
 
+@media screen and (max-width: 457px) {
+  .org-slot {
+    min-width: 100%;
+    max-height: calc(100vh - 48px);
+    overflow-y: auto;
+  }
+}
+
 @tailwind components;
 
 @tailwind utilities;
diff --git a/apps/dashboard/src/lib/components/Org/Community/DeleteCommentModal.svelte b/apps/dashboard/src/lib/components/Org/Community/DeleteModal.svelte
similarity index 70%
rename from apps/dashboard/src/lib/components/Org/Community/DeleteCommentModal.svelte
rename to apps/dashboard/src/lib/components/Org/Community/DeleteModal.svelte
index 0679954c..faea14a3 100644
--- a/apps/dashboard/src/lib/components/Org/Community/DeleteCommentModal.svelte
+++ b/apps/dashboard/src/lib/components/Org/Community/DeleteModal.svelte
@@ -6,11 +6,19 @@
   export let onDelete = () => {};
   export let onCancel = () => {};
   export let open = false;
+  export let isQuestion = false;
 </script>
 
-<Modal onClose={() => (open = false)} bind:open width="w-96" modalHeading="Delete comment">
+<Modal
+  onClose={() => (open = false)}
+  bind:open
+  width="w-96"
+  modalHeading="Delete {isQuestion ? 'question' : 'comment'}"
+>
   <div>
-    <h1 class="dark:text-white text-lg">Are you sure you want to delete this comment?</h1>
+    <h1 class="dark:text-white text-lg">
+      Are you sure you want to delete this {isQuestion ? 'question' : 'comment'}?
+    </h1>
 
     <div class="mt-5 flex items-center justify-between">
       <PrimaryButton
diff --git a/apps/dashboard/src/lib/components/Org/Community/index.svelte b/apps/dashboard/src/lib/components/Org/Community/index.svelte
index 887e58e5..3e49ae05 100644
--- a/apps/dashboard/src/lib/components/Org/Community/index.svelte
+++ b/apps/dashboard/src/lib/components/Org/Community/index.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { goto } from '$app/navigation';
   import AddCommentIcon from 'carbon-icons-svelte/lib/AddComment.svelte';
   import CommunityLoader from './Loader.svelte';
@@ -15,10 +15,9 @@
   let isLoading = false;
   let discussions = [];
 
-  async function fetchCommunityQuestions(orgId) {
+  async function fetchCommunityQuestions(orgId?: string) {
     if (!orgId) return;
     isLoading = true;
-
     const { data, error } = await supabase
       .from('community_question')
       .select(
@@ -29,12 +28,13 @@
         created_at,
         slug,
         comments:community_answer(count),
-        author:organizationmember!community_question_author_id_fkey!inner(
-          profile!inner(fullname)
+        author:profile(
+          fullname
         )
       `
       )
-      .eq('organization_id', orgId);
+      .eq('organization_id', orgId)
+      .order('created_at', { ascending: false });
     console.log('data', data);
     console.log('error', error);
     isLoading = false;
@@ -48,7 +48,7 @@
       data?.map((discussion) => ({
         title: discussion.title,
         slug: discussion.slug,
-        author: discussion?.author?.profile?.fullname,
+        author: discussion?.author?.fullname,
         comments: discussion.comments?.[0]?.count || 0,
         votes: discussion.votes,
         createdAt: calDateDiff(discussion.created_at)
diff --git a/apps/dashboard/src/routes/+layout.svelte b/apps/dashboard/src/routes/+layout.svelte
index 5dfe35cf..88a13489 100644
--- a/apps/dashboard/src/routes/+layout.svelte
+++ b/apps/dashboard/src/routes/+layout.svelte
@@ -15,12 +15,10 @@
   import OrgLandingPage from '$lib/components/Org/LandingPage/index.svelte';
   import Snackbar from '$lib/components/Snackbar/index.svelte';
   import Backdrop from '$lib/components/Backdrop/index.svelte';
-  import OrgSideBar from '$lib/components/Org/SideBar.svelte';
-  import LMSSideBar from '$lib/components/LMS/SideBar.svelte';
   import Apps from '$lib/components/Apps/index.svelte';
   import PlayQuiz from '$lib/components/Org/Quiz/Play/index.svelte';
   import { course } from '$lib/components/Course/store';
-  import { isCoursesPage, isOrgPage, isLMSPage, isQuizPage } from '$lib/utils/functions/app';
+  import { isCoursesPage, isOrgPage, isLMSPage } from '$lib/utils/functions/app';
   import showAppsSideBar from '$lib/utils/functions/showAppsSideBar';
   import isPublicRoute from '$lib/utils/functions/routes/isPublicRoute';
   import { user, profile } from '$lib/utils/store/user';
@@ -34,7 +32,6 @@
   import { setTheme } from '$lib/utils/functions/theme';
   import hideNavByRoute from '$lib/utils/functions/routes/hideNavByRoute';
   import shouldRedirectOnAuth from '$lib/utils/functions/routes/shouldRedirectOnAuth';
-  import AddOrgModal from '$lib/components/Org/AddOrgModal/AddOrgModal.svelte';
   import { identifyPosthogUser, initPosthog } from '$lib/utils/services/posthog';
   import { initSentry, setSentryUser } from '$lib/utils/services/sentry';
 
@@ -412,11 +409,4 @@
       row-gap: 12px;
     }
   }
-  @media screen and (max-width: 457px) {
-    .org-slot {
-      min-width: 100%;
-      max-height: calc(100vh - 48px);
-      overflow-y: auto;
-    }
-  }
 </style>
diff --git a/apps/dashboard/src/routes/lms/community/+page.svelte b/apps/dashboard/src/routes/lms/community/+page.svelte
index f41d39ea..a521d873 100644
--- a/apps/dashboard/src/routes/lms/community/+page.svelte
+++ b/apps/dashboard/src/routes/lms/community/+page.svelte
@@ -2,10 +2,9 @@
   import { goto } from '$app/navigation';
   import Community from '$lib/components/Org/Community/index.svelte';
   import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
-  import { currentOrgPath } from '$lib/utils/store/org';
 
   function askCommunity() {
-    goto(`${$currentOrgPath}/community/ask`);
+    goto(`/lms/community/ask`);
   }
 </script>
 
diff --git a/apps/dashboard/src/routes/lms/community/[slug]/+page.svelte b/apps/dashboard/src/routes/lms/community/[slug]/+page.svelte
index 8bfca0a3..d298efb0 100644
--- a/apps/dashboard/src/routes/lms/community/[slug]/+page.svelte
+++ b/apps/dashboard/src/routes/lms/community/[slug]/+page.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { goto } from '$app/navigation';
   import pluralize from 'pluralize';
   import TrashCanIcon from 'carbon-icons-svelte/lib/TrashCan.svelte';
@@ -10,7 +10,7 @@
   import Avatar from '$lib/components/Avatar/index.svelte';
   import IconButton from '$lib/components/IconButton/index.svelte';
   import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte';
-  import { currentOrg } from '$lib/utils/store/org';
+  import { isOrgAdmin } from '$lib/utils/store/org';
   import { profile } from '$lib/utils/store/user';
   import { supabase } from '$lib/utils/functions/supabase';
   import {
@@ -19,23 +19,59 @@
   } from '$lib/utils/functions/validator';
   import { snackbar } from '$lib/components/Snackbar/store';
   import TextField from '$lib/components/Form/TextField.svelte';
-  import DeleteCommentModal from '$lib/components/Org/Community/DeleteCommentModal.svelte';
+  import DeleteModal from '$lib/components/Org/Community/DeleteModal.svelte';
   import TextEditor from '$lib/components/TextEditor/index.svelte';
   import { calDateDiff } from '$lib/utils/functions/date';
+  import { browser } from '$app/environment';
 
   export let data;
   const { slug } = data;
 
-  let question;
+  interface Comment {
+    id: string;
+    authorId: string;
+    name: string;
+    avatar: string;
+    votes: number;
+    comment: string;
+    createdAt: string;
+  }
+  interface Question {
+    id: string;
+    title: string;
+    votes: number;
+    author: {
+      id: string;
+      name: string;
+      avatar: string;
+    };
+    body: string;
+    createdAt: string;
+    comments: Comment[];
+    totalComments: number;
+  }
+
+  let question: Question;
   let comment = '';
-  let errors = {};
+  let errors: {
+    title?: string;
+  } = {};
   let isValidAnswer = false; // V2 allow admin mark an answer as accepted
   let resetInput = 1;
-  let voted = { question: false, comment: {} };
+  let voted: {
+    question: boolean;
+    comment: {
+      [key: string]: boolean;
+    };
+  } = { question: false, comment: {} };
   let isEditMode = false;
   let deleteComment = {
     shouldDelete: false,
-    commentId: null
+    commentId: ''
+  };
+  let deleteQuestion = {
+    shouldDelete: false,
+    questionId: ''
   };
   let editContent = {
     title: '',
@@ -44,23 +80,23 @@
 
   let editorInstance = false;
 
-  function mapResToQuestion(data) {
+  function mapResToQuestion(data): Question {
     return {
       id: data.id,
       title: data.title,
       votes: data.votes,
       author: {
-        id: data?.author?.profile?.id || '',
-        name: data?.author?.profile?.fullname || '',
-        avatar: data?.author?.profile?.avatar_url || ''
+        id: data?.author?.id || '',
+        name: data?.author?.fullname || '',
+        avatar: data?.author?.avatar_url || ''
       },
       body: data.body,
       createdAt: calDateDiff(data.created_at),
       comments: data.comments.map((c) => ({
         id: c.id,
-        authorId: c.author?.profile?.id || '',
-        name: c.author?.profile?.fullname || '',
-        avatar: c.author?.profile?.avatar_url || '',
+        authorId: c.author?.id || '',
+        name: c.author?.fullname || '',
+        avatar: c.author?.avatar_url || '',
         votes: c.votes,
         comment: c.body,
         createdAt: calDateDiff(c.created_at)
@@ -69,7 +105,7 @@
     };
   }
 
-  async function fetchCommunityQuestion(slug) {
+  async function fetchCommunityQuestion(slug: string) {
     if (!slug) return;
 
     const { data, error } = await supabase
@@ -81,26 +117,23 @@
         body,
         votes,
         created_at,
+        slug,
         comments:community_answer(
           id,
           body,
           votes,
           created_at,
-          author:organizationmember!community_answer_author_id_fkey!inner(
-            profile!inner(id, fullname, avatar_url)
-          )
+          author:profile(id, fullname, avatar_url)
         ),
-        author:organizationmember!community_question_author_id_fkey!inner(
-          profile!inner(id, fullname, avatar_url)
-        )
+        author:profile(id, fullname, avatar_url)
       `
       )
       .eq('slug', slug)
       .single();
 
     if (error) {
-      console.error('Error loading community', error);
-      return goto('/lms/community');
+      console.error('[LMS] Error loading community', error);
+      return goto(`/lms`);
     }
 
     question = mapResToQuestion(data);
@@ -121,7 +154,7 @@
         id: undefined,
         body: comment,
         question_id: question.id,
-        author_id: $currentOrg.memberId,
+        author_profile_id: $profile.id,
         votes: 0
       })
       .select();
@@ -132,7 +165,7 @@
     } else {
       console.log('Success: commenting', data);
 
-      snackbar.success();
+      snackbar.success('Comment Submitted!');
 
       // Add to comment
       const _c = data?.[0];
@@ -140,6 +173,7 @@
         ...question.comments,
         {
           id: _c.id,
+          authorId: $profile.id || '',
           name: $profile?.fullname || '',
           avatar: $profile?.avatar_url || '',
           votes: 0,
@@ -154,11 +188,11 @@
     }
   }
 
-  async function upvoteQuestion(type, commentId) {
+  async function upvoteQuestion(type: string, commentId?: string) {
     const isQuestion = type === 'question';
 
     if (isQuestion && voted.question) return;
-    if (!isQuestion && voted.comment[commentId]) return;
+    if (!isQuestion && commentId && voted.comment[commentId]) return;
 
     const table = isQuestion ? 'community_question' : 'community_answer';
     const matchId = isQuestion ? question.id : commentId;
@@ -179,11 +213,11 @@
     const { error } = await supabase.from(table).update({ votes }).match({ id: matchId });
     if (error) {
       console.error('Error: upvoteQuestion', error);
-      snackbar.error();
+      snackbar.error('Error - Please try again later');
     } else {
       if (isQuestion) {
         voted.question = true;
-      } else {
+      } else if (commentId) {
         voted.comment[commentId] = true;
       }
     }
@@ -217,7 +251,7 @@
         .match({ id: question.id });
       if (error) {
         console.error('Error: handleQuestionEdit', error);
-        snackbar.error();
+        snackbar.error('Error - Please try again later');
       } else {
         question.title = fields.title;
         question.body = fields.body;
@@ -231,34 +265,78 @@
     }
   }
 
-  async function handleCommentDelete() {
-    const { error } = await supabase
+  async function handleDelete(isQuestion: boolean) {
+    if (!isQuestion) {
+      const { error } = await supabase
+        .from('community_answer')
+        .delete()
+        .match({ id: deleteComment.commentId });
+
+      if (error) {
+        snackbar.error('Error deleting comments');
+        console.log('Error deleting comments', error);
+        return;
+      }
+      snackbar.success('Deleted successfully');
+
+      question.comments = question.comments.filter((c) => c.id !== deleteComment.commentId);
+      deleteComment.shouldDelete = false;
+      deleteComment.commentId = '';
+
+      // Handle only delete comment
+      return;
+    }
+
+    const { error: commentDeleteError } = await supabase
       .from('community_answer')
       .delete()
-      .match({ id: deleteComment.commentId });
+      .match({ question_id: deleteQuestion.questionId });
 
-    if (!error) {
-      question.comments = question.comments.filter((c) => c.id !== deleteComment.commentId);
-
-      deleteComment.shouldDelete = false;
-      deleteComment.commentId = null;
+    if (commentDeleteError) {
+      snackbar.error('Error deleting comments');
+      console.log('Error deleting comments', commentDeleteError);
+      return;
     }
+
+    const { error: questionDeleteError } = await supabase
+      .from('community_question')
+      .delete()
+      .match({ id: deleteQuestion.questionId });
+
+    if (questionDeleteError) {
+      snackbar.error('Error deleting question');
+      console.log('Error deleting question', questionDeleteError);
+      return;
+    }
+
+    snackbar.success('Deleted successfully');
+    goto(`/lms/community`);
   }
 
-  $: fetchCommunityQuestion(slug);
+  $: browser && fetchCommunityQuestion(slug);
 </script>
 
 <svelte:head>
   <title>{question?.title || 'Question'}</title>
 </svelte:head>
 
-<DeleteCommentModal
+<DeleteModal
+  bind:open={deleteQuestion.shouldDelete}
+  onCancel={() => {
+    deleteQuestion.shouldDelete = false;
+    deleteQuestion.questionId = '';
+  }}
+  onDelete={() => handleDelete(true)}
+  isQuestion={true}
+/>
+
+<DeleteModal
   bind:open={deleteComment.shouldDelete}
   onCancel={() => {
     deleteComment.shouldDelete = false;
-    deleteComment.commentId = null;
+    deleteComment.commentId = '';
   }}
-  onDelete={handleCommentDelete}
+  onDelete={() => handleDelete(false)}
 />
 <section class="max-w-3xl mx-auto md:mx-10 lg:mb-20">
   {#if !question}
@@ -322,6 +400,17 @@
               {question.createdAt}
             </p>
           </div>
+          {#if question.author.id === $profile.id || $isOrgAdmin}
+            <IconButton
+              value="delete-question"
+              onClick={() => {
+                deleteQuestion.shouldDelete = true;
+                deleteQuestion.questionId = question.id;
+              }}
+            >
+              <TrashCanIcon size={16} class="carbon-icon dark:text-white" />
+            </IconButton>
+          {/if}
         </header>
         {#if isEditMode && editorInstance}
           <div class="my-2">
@@ -363,7 +452,7 @@
                 <CheckmarkOutlineIcon size={20} />
               {/if}
 
-              {#if comment.authorId === $profile.id}
+              {#if comment.authorId === $profile.id || $isOrgAdmin}
                 <IconButton
                   value="delete-comment"
                   onClick={() => {
diff --git a/apps/dashboard/src/routes/lms/community/ask/+page.svelte b/apps/dashboard/src/routes/lms/community/ask/+page.svelte
index 5d27b44f..67fbbc71 100644
--- a/apps/dashboard/src/routes/lms/community/ask/+page.svelte
+++ b/apps/dashboard/src/routes/lms/community/ask/+page.svelte
@@ -9,6 +9,7 @@
   import generateSlug from '$lib/utils/functions/generateSlug';
   import TextEditor from '$lib/components/TextEditor/index.svelte';
   import TextField from '$lib/components/Form/TextField.svelte';
+  import { profile } from '$lib/utils/store/user';
 
   let errors: {
     title?: string;
@@ -31,7 +32,7 @@
       .insert({
         ...fields,
         organization_id: $currentOrg.id,
-        author_id: $currentOrg.memberId,
+        author_profile_id: $profile.id,
         votes: 0,
         slug: generateSlug(fields.title)
       })
@@ -41,10 +42,11 @@
       console.error('Error: asking question', error);
       snackbar.error();
     } else {
-      console.log('Success: asking question', question);
+      const slug = question[0]?.slug;
+      console.log('Success: asking question in lms', question, slug);
       snackbar.success();
 
-      goto(`/lms/community/${question[0].slug}`);
+      goto(`/lms/community/${slug}`);
     }
   }
 </script>
@@ -65,11 +67,7 @@
   </div>
 
   <div class="mb-3 p-2">
-    <TextField 
-      bind:value={fields.title}
-      placeholder="Title"
-      errorMessage={errors.title}
-    />
+    <TextField bind:value={fields.title} placeholder="Title" errorMessage={errors.title} />
   </div>
 
   <TextEditor
diff --git a/apps/dashboard/src/routes/org/[slug]/community/+page.svelte b/apps/dashboard/src/routes/org/[slug]/community/+page.svelte
index 057e7079..57e44a2f 100644
--- a/apps/dashboard/src/routes/org/[slug]/community/+page.svelte
+++ b/apps/dashboard/src/routes/org/[slug]/community/+page.svelte
@@ -4,7 +4,6 @@
   import PrimaryButton from '$lib/components/PrimaryButton/index.svelte';
   import { currentOrgPath } from '$lib/utils/store/org';
   import { isMobile } from '$lib/utils/store/useMobile';
-  import AddFilled from 'carbon-icons-svelte/lib/AddFilled.svelte';
   import Add from 'carbon-icons-svelte/lib/Add.svelte';
 
   function askCommunity() {
diff --git a/apps/dashboard/src/routes/org/[slug]/community/[slug]/+page.svelte b/apps/dashboard/src/routes/org/[slug]/community/[slug]/+page.svelte
index 4d605c4d..4386f016 100644
--- a/apps/dashboard/src/routes/org/[slug]/community/[slug]/+page.svelte
+++ b/apps/dashboard/src/routes/org/[slug]/community/[slug]/+page.svelte
@@ -1,4 +1,5 @@
-<script>
+<script lang="ts">
+  import { goto } from '$app/navigation';
   import pluralize from 'pluralize';
   import TrashCanIcon from 'carbon-icons-svelte/lib/TrashCan.svelte';
   import { SkeletonPlaceholder, SkeletonText } from 'carbon-components-svelte';
@@ -9,7 +10,7 @@
   import Avatar from '$lib/components/Avatar/index.svelte';
   import IconButton from '$lib/components/IconButton/index.svelte';
   import CheckmarkOutlineIcon from 'carbon-icons-svelte/lib/CheckmarkOutline.svelte';
-  import { currentOrgPath, currentOrg } from '$lib/utils/store/org';
+  import { currentOrgPath, isOrgAdmin } from '$lib/utils/store/org';
   import { profile } from '$lib/utils/store/user';
   import { supabase } from '$lib/utils/functions/supabase';
   import {
@@ -18,23 +19,59 @@
   } from '$lib/utils/functions/validator';
   import { snackbar } from '$lib/components/Snackbar/store';
   import TextField from '$lib/components/Form/TextField.svelte';
-  import DeleteCommentModal from '$lib/components/Org/Community/DeleteCommentModal.svelte';
+  import DeleteModal from '$lib/components/Org/Community/DeleteModal.svelte';
   import TextEditor from '$lib/components/TextEditor/index.svelte';
   import { calDateDiff } from '$lib/utils/functions/date';
+  import { browser } from '$app/environment';
 
   export let data;
   const { slug } = data;
 
-  let question;
+  interface Comment {
+    id: string;
+    authorId: string;
+    name: string;
+    avatar: string;
+    votes: number;
+    comment: string;
+    createdAt: string;
+  }
+  interface Question {
+    id: string;
+    title: string;
+    votes: number;
+    author: {
+      id: string;
+      name: string;
+      avatar: string;
+    };
+    body: string;
+    createdAt: string;
+    comments: Comment[];
+    totalComments: number;
+  }
+
+  let question: Question;
   let comment = '';
-  let errors = {};
+  let errors: {
+    title?: string;
+  } = {};
   let isValidAnswer = false; // V2 allow admin mark an answer as accepted
   let resetInput = 1;
-  let voted = { question: false, comment: {} };
+  let voted: {
+    question: boolean;
+    comment: {
+      [key: string]: boolean;
+    };
+  } = { question: false, comment: {} };
   let isEditMode = false;
   let deleteComment = {
     shouldDelete: false,
-    commentId: null
+    commentId: ''
+  };
+  let deleteQuestion = {
+    shouldDelete: false,
+    questionId: ''
   };
   let editContent = {
     title: '',
@@ -43,23 +80,23 @@
 
   let editorInstance = false;
 
-  function mapResToQuestion(data) {
+  function mapResToQuestion(data): Question {
     return {
       id: data.id,
       title: data.title,
       votes: data.votes,
       author: {
-        id: data?.author?.profile?.id || '',
-        name: data?.author?.profile?.fullname || '',
-        avatar: data?.author?.profile?.avatar_url || ''
+        id: data?.author?.id || '',
+        name: data?.author?.fullname || '',
+        avatar: data?.author?.avatar_url || ''
       },
       body: data.body,
       createdAt: calDateDiff(data.created_at),
       comments: data.comments.map((c) => ({
         id: c.id,
-        authorId: c.author?.profile?.id || '',
-        name: c.author?.profile?.fullname || '',
-        avatar: c.author?.profile?.avatar_url || '',
+        authorId: c.author?.id || '',
+        name: c.author?.fullname || '',
+        avatar: c.author?.avatar_url || '',
         votes: c.votes,
         comment: c.body,
         createdAt: calDateDiff(c.created_at)
@@ -68,7 +105,7 @@
     };
   }
 
-  async function fetchCommunityQuestion(slug) {
+  async function fetchCommunityQuestion(slug: string) {
     if (!slug) return;
 
     const { data, error } = await supabase
@@ -80,25 +117,22 @@
         body,
         votes,
         created_at,
+        slug,
         comments:community_answer(
           id,
           body,
           votes,
           created_at,
-          author:organizationmember!community_answer_author_id_fkey!inner(
-            profile!inner(id, fullname, avatar_url)
-          )
+          author:profile(id, fullname, avatar_url)
         ),
-        author:organizationmember!community_question_author_id_fkey!inner(
-          profile!inner(id, fullname, avatar_url)
-        )
+        author:profile(id, fullname, avatar_url)
       `
       )
       .eq('slug', slug)
       .single();
 
     if (error) {
-      console.error('Error loading community', error);
+      console.error('[ORG] Error loading community', error);
       return goto(`${currentOrgPath}`);
     }
 
@@ -120,7 +154,7 @@
         id: undefined,
         body: comment,
         question_id: question.id,
-        author_id: $currentOrg.memberId,
+        author_profile_id: $profile.id,
         votes: 0
       })
       .select();
@@ -139,6 +173,7 @@
         ...question.comments,
         {
           id: _c.id,
+          authorId: $profile.id || '',
           name: $profile?.fullname || '',
           avatar: $profile?.avatar_url || '',
           votes: 0,
@@ -153,11 +188,11 @@
     }
   }
 
-  async function upvoteQuestion(type, commentId) {
+  async function upvoteQuestion(type: string, commentId?: string) {
     const isQuestion = type === 'question';
 
     if (isQuestion && voted.question) return;
-    if (!isQuestion && voted.comment[commentId]) return;
+    if (!isQuestion && commentId && voted.comment[commentId]) return;
 
     const table = isQuestion ? 'community_question' : 'community_answer';
     const matchId = isQuestion ? question.id : commentId;
@@ -182,7 +217,7 @@
     } else {
       if (isQuestion) {
         voted.question = true;
-      } else {
+      } else if (commentId) {
         voted.comment[commentId] = true;
       }
     }
@@ -230,34 +265,78 @@
     }
   }
 
-  async function handleCommentDelete() {
-    const { error } = await supabase
+  async function handleDelete(isQuestion: boolean) {
+    if (!isQuestion) {
+      const { error } = await supabase
+        .from('community_answer')
+        .delete()
+        .match({ id: deleteComment.commentId });
+
+      if (error) {
+        snackbar.error('Error deleting comments');
+        console.log('Error deleting comments', error);
+        return;
+      }
+      snackbar.success('Deleted successfully');
+
+      question.comments = question.comments.filter((c) => c.id !== deleteComment.commentId);
+      deleteComment.shouldDelete = false;
+      deleteComment.commentId = '';
+
+      // Handle only delete comment
+      return;
+    }
+
+    const { error: commentDeleteError } = await supabase
       .from('community_answer')
       .delete()
-      .match({ id: deleteComment.commentId });
+      .match({ question_id: deleteQuestion.questionId });
 
-    if (!error) {
-      question.comments = question.comments.filter((c) => c.id !== deleteComment.commentId);
-
-      deleteComment.shouldDelete = false;
-      deleteComment.commentId = null;
+    if (commentDeleteError) {
+      snackbar.error('Error deleting comments');
+      console.log('Error deleting comments', commentDeleteError);
+      return;
     }
+
+    const { error: questionDeleteError } = await supabase
+      .from('community_question')
+      .delete()
+      .match({ id: deleteQuestion.questionId });
+
+    if (questionDeleteError) {
+      snackbar.error('Error deleting question');
+      console.log('Error deleting question', questionDeleteError);
+      return;
+    }
+
+    snackbar.success('Deleted successfully');
+    goto(`${$currentOrgPath}/community`);
   }
 
-  $: fetchCommunityQuestion(slug);
+  $: browser && fetchCommunityQuestion(slug);
 </script>
 
 <svelte:head>
   <title>{question?.title || 'Question'}</title>
 </svelte:head>
 
-<DeleteCommentModal
+<DeleteModal
+  bind:open={deleteQuestion.shouldDelete}
+  onCancel={() => {
+    deleteQuestion.shouldDelete = false;
+    deleteQuestion.questionId = '';
+  }}
+  onDelete={() => handleDelete(true)}
+  isQuestion={true}
+/>
+
+<DeleteModal
   bind:open={deleteComment.shouldDelete}
   onCancel={() => {
     deleteComment.shouldDelete = false;
-    deleteComment.commentId = null;
+    deleteComment.commentId = '';
   }}
-  onDelete={handleCommentDelete}
+  onDelete={() => handleDelete(false)}
 />
 <section class="max-w-3xl mx-auto md:mx-10 lg:mb-20">
   {#if !question}
@@ -324,6 +403,17 @@
               {question.createdAt}
             </p>
           </div>
+          {#if question.author.id === $profile.id || $isOrgAdmin}
+            <IconButton
+              value="delete-question"
+              onClick={() => {
+                deleteQuestion.shouldDelete = true;
+                deleteQuestion.questionId = question.id;
+              }}
+            >
+              <TrashCanIcon size={16} class="carbon-icon dark:text-white" />
+            </IconButton>
+          {/if}
         </header>
         {#if isEditMode && editorInstance}
           <div class="my-2">
@@ -365,7 +455,7 @@
                 <CheckmarkOutlineIcon size={20} />
               {/if}
 
-              {#if comment.authorId === $profile.id}
+              {#if comment.authorId === $profile.id || $isOrgAdmin}
                 <IconButton
                   value="delete-comment"
                   onClick={() => {
diff --git a/apps/dashboard/src/routes/org/[slug]/community/ask/+page.svelte b/apps/dashboard/src/routes/org/[slug]/community/ask/+page.svelte
index e22f597c..96496c09 100644
--- a/apps/dashboard/src/routes/org/[slug]/community/ask/+page.svelte
+++ b/apps/dashboard/src/routes/org/[slug]/community/ask/+page.svelte
@@ -9,6 +9,7 @@
   import generateSlug from '$lib/utils/functions/generateSlug';
   import TextEditor from '$lib/components/TextEditor/index.svelte';
   import TextField from '$lib/components/Form/TextField.svelte';
+  import { profile } from '$lib/utils/store/user';
 
   let errors: {
     title?: string;
@@ -31,7 +32,7 @@
       .insert({
         ...fields,
         organization_id: $currentOrg.id,
-        author_id: $currentOrg.memberId,
+        author_profile_id: $profile.id,
         votes: 0,
         slug: generateSlug(fields.title)
       })
@@ -41,9 +42,11 @@
       console.error('Error: asking question', error);
       snackbar.error('Error - Please try again later');
     } else {
-      console.log('Success: asking question', question);
+      const slug = question[0]?.slug;
+
+      console.log('Success: asking question', question, slug);
       snackbar.success('Question Submitted!');
-      goto(`${$currentOrgPath}/community/${question[0].slug}`);
+      goto(`${$currentOrgPath}/community/${slug}`);
     }
   }
 </script>
@@ -67,11 +70,7 @@
   </div>
 
   <div class="mb-3 p-2">
-    <TextField 
-      bind:value={fields.title}
-      placeholder="Title"
-      errorMessage={errors.title}
-    />
+    <TextField bind:value={fields.title} placeholder="Title" errorMessage={errors.title} />
   </div>
   <div class="px-2">
     <TextEditor
diff --git a/supabase/migrations/20231213104402_course_metadata.sql b/supabase/migrations/20231213104402_course_metadata.sql
new file mode 100644
index 00000000..308e332e
--- /dev/null
+++ b/supabase/migrations/20231213104402_course_metadata.sql
@@ -0,0 +1 @@
+alter table "public"."course" alter column "metadata" set default '{"goals": "", "description": "", "requirements": ""}'::jsonb;
\ No newline at end of file
diff --git a/supabase/migrations/20231213105201_organizationmember_author_profile_id.sql b/supabase/migrations/20231213105201_organizationmember_author_profile_id.sql
new file mode 100644
index 00000000..dd6ee936
--- /dev/null
+++ b/supabase/migrations/20231213105201_organizationmember_author_profile_id.sql
@@ -0,0 +1,11 @@
+alter table "public"."community_answer" add column "author_profile_id" uuid;
+
+alter table "public"."community_question" add column "author_profile_id" uuid;
+
+alter table "public"."community_answer" add constraint "community_answer_author_profile_id_fkey" FOREIGN KEY (author_profile_id) REFERENCES profile(id) not valid;
+
+alter table "public"."community_answer" validate constraint "community_answer_author_profile_id_fkey";
+
+alter table "public"."community_question" add constraint "community_question_author_profile_id_fkey" FOREIGN KEY (author_profile_id) REFERENCES profile(id) not valid;
+
+alter table "public"."community_question" validate constraint "community_question_author_profile_id_fkey";
\ No newline at end of file