diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index b4fa8cba57..90ad14f661 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -231,6 +231,7 @@ test('setCourseConfiguration generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultLlmPrompt: 'defaul Llm Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = setCourseConfiguration(courseConfig);
@@ -510,6 +511,7 @@ test('updateGradingOverviews generates correct action object', () => {
     {
       assessmentId: 1,
       assessmentName: 'test assessment',
+      questions: '',
       assessmentType: 'Contests',
       initialXp: 0,
       xpBonus: 100,
@@ -612,6 +614,7 @@ test('updateCourseConfig generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultLlmPrompt: 'default LLM Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = updateCourseConfig(courseConfig);
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index 3cafa4cb5f..2f137c9723 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -99,6 +99,7 @@ test('SET_COURSE_CONFIGURATION works correctly', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultLlmPrompt: 'default LLM Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = {
@@ -474,6 +475,7 @@ const gradingOverviewTest1: GradingOverview[] = [
   {
     assessmentId: 1,
     assessmentName: 'test assessment',
+    questions: '',
     assessmentType: 'Contests',
     initialXp: 0,
     xpBonus: 100,
@@ -495,6 +497,7 @@ const gradingOverviewTest2: GradingOverview[] = [
   {
     assessmentId: 2,
     assessmentName: 'another assessment',
+    questions: '',
     assessmentType: 'Quests',
     initialXp: 20,
     xpBonus: 250,
diff --git a/src/commons/application/types/SessionTypes.ts b/src/commons/application/types/SessionTypes.ts
index f1b5d12681..94668bda7f 100644
--- a/src/commons/application/types/SessionTypes.ts
+++ b/src/commons/application/types/SessionTypes.ts
@@ -51,6 +51,7 @@ export const UPDATE_TOTAL_XP = 'UPDATE_TOTAL_XP';
 export const UPDATE_ALL_USER_XP = 'UPDATE_ALL_USER_XP';
 export const UPDATE_ASSESSMENT = 'UPDATE_ASSESSMENT';
 export const UPDATE_GRADING_OVERVIEWS = 'UPDATE_GRADING_OVERVIEWS';
+export const UPDATE_GRADING_OVERVIEWS_TEST = 'UPDATE_GRADING_OVERVIEWS_TEST';
 export const UPDATE_GRADING = 'UPDATE_GRADING';
 export const FETCH_NOTIFICATIONS = 'FETCH_NOTIFICATIONS';
 export const ACKNOWLEDGE_NOTIFICATIONS = 'ACKNOWLEDGE_NOTIFICATIONS';
@@ -106,6 +107,7 @@ export type SessionState = {
   readonly sourceChapter?: number;
   readonly sourceVariant?: Variant;
   readonly moduleHelpText?: string;
+  readonly defaultLlmPrompt?: string;
   readonly assetsPrefix?: string;
 
   readonly assessmentConfigurations?: AssessmentConfiguration[];
@@ -171,6 +173,7 @@ export type CourseConfiguration = {
   sourceChapter: Chapter;
   sourceVariant: Variant;
   moduleHelpText: string;
+  defaultLlmPrompt: string;
   assetsPrefix: string;
 };
 
diff --git a/src/commons/dropdown/DropdownCreateCourse.tsx b/src/commons/dropdown/DropdownCreateCourse.tsx
index 7c5b7f70e1..cfed4673c7 100644
--- a/src/commons/dropdown/DropdownCreateCourse.tsx
+++ b/src/commons/dropdown/DropdownCreateCourse.tsx
@@ -40,7 +40,8 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
     enableSourcecast: true,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    defaultLlmPrompt: ''
   });
 
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
@@ -173,6 +174,40 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
           )}
         </FormGroup>
 
+        <FormGroup helperText="defaultLlmPrompt" labelFor="defaultLlmPrompt">
+          <Text tagName="span">Default LLM Prompt&nbsp;</Text>
+          <Text tagName="span" className="optional-text">
+            (optional)
+          </Text>
+          <Tabs
+            selectedTabId={courseHelpTextSelectedTab}
+            onChange={onChangeTabs}
+            className="module-help-text-tabs"
+          >
+            <Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
+            <Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
+          </Tabs>
+          {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && (
+            <TextArea
+              id="defaultLlmPrompt"
+              className="input-textarea"
+              fill={true}
+              value={courseConfig.defaultLlmPrompt}
+              onChange={e =>
+                setCourseConfig({
+                  ...courseConfig,
+                  defaultLlmPrompt: e.target.value
+                })
+              }
+            />
+          )}
+          {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && (
+            <div className="input-markdown">
+              <Markdown content={courseConfig.defaultLlmPrompt || ''} openLinksInNewWindow />
+            </div>
+          )}
+        </FormGroup>
+
         <div className="boolean-container">
           <div>
             <Switch
diff --git a/src/commons/dropdown/DropdownPrompt.tsx b/src/commons/dropdown/DropdownPrompt.tsx
new file mode 100644
index 0000000000..1e2bacc39f
--- /dev/null
+++ b/src/commons/dropdown/DropdownPrompt.tsx
@@ -0,0 +1,46 @@
+import { Classes, Dialog } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import * as React from 'react';
+
+import Markdown from '../Markdown';
+import { Links } from '../utils/Constants';
+import { useTypedSelector } from '../utils/Hooks';
+
+type DialogProps = {
+  isOpen: boolean;
+  onClose: () => void;
+};
+
+const DropdownPrompt: React.FC<DialogProps> = props => {
+  const defaultLlmPrompt = useTypedSelector(store => store.session.defaultLlmPrompt);
+
+  return (
+    <Dialog
+      className="help"
+      icon={IconNames.ERROR}
+      isCloseButtonShown={true}
+      isOpen={props.isOpen}
+      onClose={props.onClose}
+      title="Help"
+    >
+      <div className={Classes.DIALOG_BODY}>
+        {defaultLlmPrompt ? (
+          <Markdown content={defaultLlmPrompt} openLinksInNewWindow />
+        ) : (
+          <>
+            <p>
+              We recommend recent updates of the browsers <b>Google Chrome</b>,{' '}
+              <b>Microsoft Edge</b>, or <b>Mozilla Firefox</b> to visit the Source Academy.
+            </p>
+            <p>
+              If you encounter issues with the Source Academy using these browsers, please use the
+              issue system of the{' '}
+              <a href={Links.githubIssues}>Source Academy frontend repository on GitHub</a>.
+            </p>
+          </>
+        )}
+      </div>
+    </Dialog>
+  );
+};
+export default DropdownPrompt;
diff --git a/src/commons/mocks/GradingMocks.ts b/src/commons/mocks/GradingMocks.ts
index 9f1849b858..3bda03f6a7 100644
--- a/src/commons/mocks/GradingMocks.ts
+++ b/src/commons/mocks/GradingMocks.ts
@@ -11,6 +11,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0 ',
+    questions: '',
     currentXp: 69,
     xpBonus: 10,
     initialXp: 69,
@@ -29,6 +30,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 1,
     assessmentName: 'Mission 1',
+    questions: '',
     currentXp: -2,
     xpBonus: 12,
     initialXp: 0,
@@ -47,6 +49,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0',
+    questions: '',
     currentXp: 1000,
     xpBonus: 12,
     initialXp: 996,
diff --git a/src/commons/mocks/UserMocks.ts b/src/commons/mocks/UserMocks.ts
index 35b1737da0..eb9e88dca1 100644
--- a/src/commons/mocks/UserMocks.ts
+++ b/src/commons/mocks/UserMocks.ts
@@ -133,6 +133,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
+    defaultLlmPrompt: '',
     assetsPrefix: ''
   },
   {
@@ -145,6 +146,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_2,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text!',
+    defaultLlmPrompt: 'Default LLM Prompt',
     assetsPrefix: ''
   }
 ];
diff --git a/src/commons/sagas/RequestsSaga.ts b/src/commons/sagas/RequestsSaga.ts
index 25a37ef6af..48c96247e6 100644
--- a/src/commons/sagas/RequestsSaga.ts
+++ b/src/commons/sagas/RequestsSaga.ts
@@ -623,6 +623,7 @@ export const getGradingOverviews = async (
         assessmentType: overview.assessment.type,
         studentId: overview.student.id,
         studentName: overview.student.name,
+        questions: overview.questions,
         submissionId: overview.id,
         submissionStatus: overview.status,
         groupName: overview.student.groupName,
diff --git a/src/commons/sagas/__tests__/BackendSaga.ts b/src/commons/sagas/__tests__/BackendSaga.ts
index 2e10e6c601..a9306b7bdd 100644
--- a/src/commons/sagas/__tests__/BackendSaga.ts
+++ b/src/commons/sagas/__tests__/BackendSaga.ts
@@ -176,6 +176,7 @@ const mockCourseConfiguration1: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_1,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
+  defaultLlmPrompt: 'default LLM prompt',
   assetsPrefix: ''
 };
 
@@ -206,6 +207,7 @@ const mockCourseConfiguration2: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_4,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
+  defaultLlmPrompt: 'default LLM prompt',
   assetsPrefix: ''
 };
 
@@ -889,6 +891,7 @@ describe('Test UPDATE_COURSE_CONFIG action', () => {
     sourceChapter: Chapter.SOURCE_4,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help',
+    defaultLlmPrompt: 'default LLM prompt',
     assetsPrefix: ''
   };
 
@@ -985,7 +988,8 @@ describe('Test CREATE_COURSE action', () => {
     enableSourcecast: true,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: 'Help Text'
+    moduleHelpText: 'Help Text',
+    defaultLlmPrompt: 'default Llm prompt'
   };
   const user = mockUser;
   const courseConfiguration = mockCourseConfiguration1;
diff --git a/src/commons/sideContent/SideContentAutograder.tsx b/src/commons/sideContent/SideContentAutograder.tsx
index 5b11670d46..40a571f996 100644
--- a/src/commons/sideContent/SideContentAutograder.tsx
+++ b/src/commons/sideContent/SideContentAutograder.tsx
@@ -8,6 +8,7 @@ import ControlButton from '../ControlButton';
 import { WorkspaceLocation } from '../workspace/WorkspaceTypes';
 import SideContentResultCard from './SideContentResultCard';
 import SideContentTestcaseCard from './SideContentTestcaseCard';
+import StarRating from './StarRating';
 
 export type SideContentAutograderProps = DispatchProps & StateProps & OwnProps;
 
@@ -31,6 +32,7 @@ type OwnProps = {
 const SideContentAutograder: React.FunctionComponent<SideContentAutograderProps> = props => {
   const [showsTestcases, setTestcasesShown] = React.useState<boolean>(true);
   const [showsResults, setResultsShown] = React.useState<boolean>(true);
+  const [userRating, setUserRating] = React.useState<number | null>(null);
 
   const { testcases, autogradingResults, handleTestcaseEval, workspaceLocation } = props;
 
@@ -96,6 +98,10 @@ const SideContentAutograder: React.FunctionComponent<SideContentAutograderProps>
       <Collapse isOpen={showsTestcases} keepChildrenMounted={true}>
         {testcaseCards}
       </Collapse>
+      <div className="star-rating-section">
+        <div className="star-rating-label">Rate the Quality of the Answer:</div>
+        <StarRating value={userRating || 0} onChange={setUserRating} />
+      </div>
       {collapseButton('Autograder Results', showsResults, toggleResults)}
       <Collapse isOpen={showsResults} keepChildrenMounted={true}>
         {resultCards}
diff --git a/src/commons/sideContent/StarRating.tsx b/src/commons/sideContent/StarRating.tsx
new file mode 100644
index 0000000000..f5fb8123e5
--- /dev/null
+++ b/src/commons/sideContent/StarRating.tsx
@@ -0,0 +1,31 @@
+import { Icon } from '@blueprintjs/core';
+import React from 'react';
+
+interface StarRatingProps {
+  value: number;
+  onChange: (rating: number) => void;
+}
+
+const StarRating: React.FC<StarRatingProps> = ({ value, onChange }) => {
+  const maxStars = 5;
+
+  const handleStarClick = (selectedValue: number) => {
+    if (onChange) {
+      onChange(selectedValue);
+    }
+  };
+
+  return (
+    <div className="star-rating">
+      {[...Array(maxStars)].map((_, index) => (
+        <Icon
+          key={index}
+          icon={value >= index + 1 ? 'star' : 'star-empty'}
+          onClick={() => handleStarClick(index + 1)}
+        />
+      ))}
+    </div>
+  );
+};
+
+export default StarRating;
diff --git a/src/features/academy/__tests__/AcademyActions.ts b/src/features/academy/__tests__/AcademyActions.ts
index 6e0b1f059e..4c15d804b8 100644
--- a/src/features/academy/__tests__/AcademyActions.ts
+++ b/src/features/academy/__tests__/AcademyActions.ts
@@ -33,7 +33,8 @@ test('createCourse generates correct action object', () => {
     enableSourcecast: true,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: 'Help Text'
+    moduleHelpText: 'Help Text',
+    defaultLlmPrompt: 'default LLM prompt'
   };
 
   const action = createCourse(courseConfig);
diff --git a/src/features/grading/GradingTypes.ts b/src/features/grading/GradingTypes.ts
index 7154e58b58..009bff21b5 100644
--- a/src/features/grading/GradingTypes.ts
+++ b/src/features/grading/GradingTypes.ts
@@ -25,6 +25,7 @@ export type GradingOverview = {
   studentName: string;
   submissionId: number;
   submissionStatus: string;
+  questions: string;
   groupName: string;
   groupLeaderId?: number;
   gradingStatus: GradingStatus;
diff --git a/src/pages/__tests__/localStorage.test.ts b/src/pages/__tests__/localStorage.test.ts
index b3b4550c72..773491fe6a 100644
--- a/src/pages/__tests__/localStorage.test.ts
+++ b/src/pages/__tests__/localStorage.test.ts
@@ -20,6 +20,7 @@ const mockShortDefaultState: SavedState = {
     enableAchievements: defaultState.session.enableAchievements,
     enableSourcecast: defaultState.session.enableSourcecast,
     moduleHelpText: defaultState.session.moduleHelpText,
+    defaultLlmPrompt: defaultState.session.defaultLlmPrompt,
     assetsPrefix: defaultState.session.assetsPrefix,
     assessmentConfigurations: defaultState.session.assessmentConfigurations
   },
diff --git a/src/pages/academy/adminPanel/AdminPanel.tsx b/src/pages/academy/adminPanel/AdminPanel.tsx
index 470e07c9be..23f693ad9f 100644
--- a/src/pages/academy/adminPanel/AdminPanel.tsx
+++ b/src/pages/academy/adminPanel/AdminPanel.tsx
@@ -45,7 +45,8 @@ const AdminPanel: React.FC = () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    defaultLlmPrompt: ''
   });
 
   const dispatch = useDispatch();
@@ -84,7 +85,8 @@ const AdminPanel: React.FC = () => {
       enableGame: session.enableGame,
       enableAchievements: session.enableAchievements,
       enableSourcecast: session.enableSourcecast,
-      moduleHelpText: session.moduleHelpText
+      moduleHelpText: session.moduleHelpText,
+      defaultLlmPrompt: session.defaultLlmPrompt
     });
 
     // IMPT: To prevent mutation of props
diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index 621c5ebe83..8a64cf9000 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -27,10 +27,57 @@ export enum CourseHelpTextEditorTab {
   PREVIEW = 'PREVIEW'
 }
 
+export enum DefaultLlmPromptTab {
+  WRITE = 'WRITE',
+  PREVIEW = 'PREVIEW'
+}
+
+type ConfigInputProps = {
+  label: string;
+  value?: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  helperText: string;
+  id: string;
+};
+
+const ConfigInput: React.FC<ConfigInputProps> = ({ label, value, onChange, helperText, id }) => (
+  <FormGroup helperText={helperText} inline={true} label={label} labelFor={id}>
+    <InputGroup id={id} value={value || ''} onChange={onChange} />
+  </FormGroup>
+);
+
+type TabPanelProps = {
+  selectedTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab;
+  onChange: (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => void;
+  tabs: {
+    id: CourseHelpTextEditorTab | DefaultLlmPromptTab;
+    title: string;
+    panel: React.ReactNode;
+  }[];
+};
+
+const TabPanel: React.FC<TabPanelProps> = ({ selectedTabId, onChange, tabs }) => (
+  <Tabs
+    selectedTabId={selectedTabId}
+    onChange={newTabId => onChange(newTabId as CourseHelpTextEditorTab | DefaultLlmPromptTab)}
+    className="module-help-text-tabs"
+  >
+    {tabs.map(tab => (
+      <Tab id={tab.id.toString()} title={tab.title} key={tab.id.toString()} />
+    ))}
+    {tabs.map(tab => selectedTabId === tab.id && tab.panel)}
+  </Tabs>
+);
+
 const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
   const { isMobileBreakpoint } = useResponsive();
-  const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
-    React.useState<CourseHelpTextEditorTab>(CourseHelpTextEditorTab.WRITE);
+  const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] = React.useState<
+    CourseHelpTextEditorTab | DefaultLlmPromptTab
+  >(CourseHelpTextEditorTab.WRITE);
+
+  const [defaultLlmPromptSelectedTab, setDefaultLlmPromptSelectedTab] = React.useState<
+    CourseHelpTextEditorTab | DefaultLlmPromptTab
+  >(DefaultLlmPromptTab.WRITE);
 
   const {
     courseName,
@@ -39,42 +86,28 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
     enableGame,
     enableAchievements,
     enableSourcecast,
-    moduleHelpText
+    moduleHelpText,
+    defaultLlmPrompt
   } = props.courseConfiguration;
 
-  const writePanel = (
-    <TextArea
-      id="moduleHelpText"
-      className="input-textarea"
-      fill={true}
-      value={moduleHelpText || ''}
-      onChange={e =>
-        props.setCourseConfiguration({
-          ...props.courseConfiguration,
-          moduleHelpText: e.target.value
-        })
+  const onChangeTabs = React.useCallback(
+    (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => {
+      if (newTabId === courseHelpTextSelectedTab) {
+        return;
       }
-    />
-  );
-
-  const previewPanel = (
-    <div className="input-markdown">
-      <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
-    </div>
+      setCourseHelpTextSelectedTab(newTabId);
+    },
+    [courseHelpTextSelectedTab]
   );
 
-  const onChangeTabs = React.useCallback(
-    (
-      newTabId: CourseHelpTextEditorTab,
-      prevTabId: CourseHelpTextEditorTab,
-      event: React.MouseEvent<HTMLElement>
-    ) => {
-      if (newTabId === prevTabId) {
+  const onChangeTab = React.useCallback(
+    (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => {
+      if (newTabId === defaultLlmPromptSelectedTab) {
         return;
       }
-      setCourseHelpTextSelectedTab(newTabId);
+      setDefaultLlmPromptSelectedTab(newTabId);
     },
-    [setCourseHelpTextSelectedTab]
+    [defaultLlmPromptSelectedTab]
   );
 
   return (
@@ -83,57 +116,115 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
       <H3>{courseShortName}</H3>
       <div className="inputs">
         <div className="text">
-          <FormGroup
-            helperText="Please enter the course name that will be used for course selection."
-            inline={true}
+          <ConfigInput
             label="Course Name"
-            labelFor="courseName"
-          >
-            <InputGroup
-              id="courseName"
-              defaultValue={courseName}
-              onChange={e =>
-                props.setCourseConfiguration({
-                  ...props.courseConfiguration,
-                  courseName: e.target.value
-                })
-              }
-            />
-          </FormGroup>
-          <FormGroup
-            helperText="Please enter the course short name. This will be displayed on the top left."
-            inline={true}
+            value={courseName}
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                courseName: e.target.value
+              })
+            }
+            helperText="Please enter the course name that will be used for course selection."
+            id="courseName"
+          />
+
+          <ConfigInput
             label="Course Short Name"
-            labelFor="courseShortName"
-          >
-            <InputGroup
-              id="courseShortName"
-              defaultValue={courseShortName}
-              onChange={e =>
-                props.setCourseConfiguration({
-                  ...props.courseConfiguration,
-                  courseShortName: e.target.value
-                })
-              }
-            />
-          </FormGroup>
+            value={courseShortName}
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                courseShortName: e.target.value
+              })
+            }
+            helperText="Please enter the course short name. This will be displayed on the top left."
+            id="courseShortName"
+          />
+
           <FormGroup
             helperText="Please enter the module help text that will be used in the course help dialog."
             inline={true}
             label="Module Help Text"
             labelFor="moduleHelpText"
           >
-            <Tabs
+            <TabPanel
               selectedTabId={courseHelpTextSelectedTab}
               onChange={onChangeTabs}
-              className="module-help-text-tabs"
-            >
-              <Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
-              <Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
-            </Tabs>
-            {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && writePanel}
-            {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && previewPanel}
+              tabs={[
+                {
+                  id: CourseHelpTextEditorTab.WRITE,
+                  title: 'Write',
+                  panel: (
+                    <TextArea
+                      id="moduleHelpText"
+                      className="input-textarea"
+                      fill={true}
+                      value={moduleHelpText || ''}
+                      onChange={e =>
+                        props.setCourseConfiguration({
+                          ...props.courseConfiguration,
+                          moduleHelpText: e.target.value
+                        })
+                      }
+                    />
+                  )
+                },
+                {
+                  id: CourseHelpTextEditorTab.PREVIEW,
+                  title: 'Preview',
+                  panel: (
+                    <div className="input-markdown">
+                      <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
+                    </div>
+                  )
+                }
+              ]}
+            />
           </FormGroup>
+
+          <FormGroup
+            helperText="Please enter the default LLM prompt that will be used in this course"
+            inline={true}
+            label="Default LLM Prompt"
+            labelFor="defaultLlmPrompt"
+          >
+            <TabPanel
+              selectedTabId={defaultLlmPromptSelectedTab}
+              onChange={onChangeTab}
+              tabs={[
+                {
+                  id: DefaultLlmPromptTab.WRITE,
+                  title: 'Write',
+                  panel: (
+                    <TextArea
+                      id="defaultLlmPrompt"
+                      className="input-textarea"
+                      fill={true}
+                      value={defaultLlmPrompt || ''}
+                      onChange={e =>
+                        props.setCourseConfiguration({
+                          ...props.courseConfiguration,
+                          defaultLlmPrompt: e.target.value
+                        })
+                      }
+                    />
+                  )
+                },
+                {
+                  id: DefaultLlmPromptTab.PREVIEW,
+                  title: 'Preview',
+                  panel: (
+                    <div className="input-markdown">
+                      <Markdown content={defaultLlmPrompt || ''} openLinksInNewWindow />
+                    </div>
+                  )
+                }
+              ]}
+            />
+          </FormGroup>
+
+          {/* ... Other inputs */}
         </div>
         {!isMobileBreakpoint && <Divider />}
         <div className="booleans">
diff --git a/src/pages/academy/grading/Grading.tsx b/src/pages/academy/grading/Grading.tsx
index abcea014be..18c005f4e4 100644
--- a/src/pages/academy/grading/Grading.tsx
+++ b/src/pages/academy/grading/Grading.tsx
@@ -65,17 +65,14 @@ const Grading: React.FC = () => {
 
     const content = new Blob(
       [
-        '"Assessment Name","Student Name","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
+        '"Student Name","Group","Status","Question","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
         ...gradingOverviews.map(
           e =>
             [
-              e.assessmentName,
               e.studentName,
               e.groupName,
               e.submissionStatus,
-              e.gradingStatus,
-              e.questionCount,
-              e.gradedCount,
+              e.questions,
               e.initialXp,
               e.xpAdjustment,
               e.currentXp,
diff --git a/src/pages/academy/grading/subcomponents/GradingEditor.tsx b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
index bd00000e57..1577256336 100644
--- a/src/pages/academy/grading/subcomponents/GradingEditor.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
@@ -47,6 +47,7 @@ type OwnProps = {
   xpAdjustment: number;
   maxXp: number;
   studentName: string;
+  questions: string;
   comments: string;
   graderName?: string;
   gradedAt?: string;
diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index 38f8387d91..e51743106c 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -305,12 +305,9 @@ const GradingWorkspace: React.FC<GradingWorkspaceProps> = props => {
             xpAdjustment={grading![questionId].grade.xpAdjustment}
             maxXp={grading![questionId].question.maxXp}
             studentName={grading![questionId].student.name}
+            questions={''}
             comments={grading![questionId].grade.comments ?? ''}
-            graderName={
-              grading![questionId].grade.grader
-                ? grading![questionId].grade.grader!.name
-                : undefined
-            }
+            graderName={grading![questionId].grade.grader?.name}
             gradedAt={
               grading![questionId].grade.grader ? grading![questionId].grade.gradedAt! : undefined
             }
diff --git a/src/pages/localStorage.ts b/src/pages/localStorage.ts
index 8e3b36531d..30a6c0077e 100644
--- a/src/pages/localStorage.ts
+++ b/src/pages/localStorage.ts
@@ -68,6 +68,7 @@ export const saveState = (state: OverallState) => {
         enableAchievements: state.session.enableAchievements,
         enableSourcecast: state.session.enableSourcecast,
         moduleHelpText: state.session.moduleHelpText,
+        defaultLlmPrompt: state.session.defaultLlmPrompt,
         assetsPrefix: state.session.assetsPrefix,
         assessmentConfigurations: state.session.assessmentConfigurations,
         notificationConfigs: state.session.notificationConfigs,