diff --git a/nextjs/src/app/CourseList.tsx b/nextjs/src/app/CourseList.tsx
index b09af4e..d74951f 100644
--- a/nextjs/src/app/CourseList.tsx
+++ b/nextjs/src/app/CourseList.tsx
@@ -38,9 +38,11 @@ export default function CourseList() {
 
   const coursesByStartDate = groupByStartDate(allSettings);
 
+  const sortedDates = Object.keys(coursesByStartDate).sort()
+
   return (
     <div className="flex flex-row ">
-      {Object.keys(coursesByStartDate).map((startDate) => (
+      {sortedDates.map((startDate) => (
         <div
           key={startDate}
           className=" border-4 border-slate-800 rounded p-3 m-3"
diff --git a/nextjs/src/app/course/[courseName]/CourseTitle.tsx b/nextjs/src/app/course/[courseName]/CourseTitle.tsx
index e6e17f8..c4b11a5 100644
--- a/nextjs/src/app/course/[courseName]/CourseTitle.tsx
+++ b/nextjs/src/app/course/[courseName]/CourseTitle.tsx
@@ -5,6 +5,6 @@ import { useCourseContext } from "./context/courseContext"
 export default function CourseTitle() {
   const {courseName}= useCourseContext()
   return (
-    <title>{process.env.NEXT_PUBLIC_TITLE_PREFIX}{courseName}</title>
+    <title>{(process.env.NEXT_PUBLIC_TITLE_PREFIX ?? "")}{courseName}</title>
   )
 }
diff --git a/nextjs/src/app/layout.tsx b/nextjs/src/app/layout.tsx
index 1c932e7..b325533 100644
--- a/nextjs/src/app/layout.tsx
+++ b/nextjs/src/app/layout.tsx
@@ -13,7 +13,7 @@ import { ClientCacheInvalidation } from "../components/realtime/ClientCacheInval
 export const dynamic = "force-dynamic";
 
 export const metadata: Metadata = {
-  title: process.env.NEXT_PUBLIC_TITLE_PREFIX + "Canvas Manager 2.0",
+  title: (process.env.NEXT_PUBLIC_TITLE_PREFIX ?? "") + "Canvas Manager 2.0",
 };
 
 export default async function RootLayout({