diff --git a/client/src/components/task_form.tsx b/client/src/components/task_form.tsx
index 54fd548..cb416cd 100644
--- a/client/src/components/task_form.tsx
+++ b/client/src/components/task_form.tsx
@@ -43,10 +43,31 @@ export function TaskForm({ userId, onTaskCreated }: TaskFormProps) {
   const [availableTopics, setAvailableTopics] = useState<Topic[]>([]);
 
   useEffect(() => {
-    fetch(process.env.NEXT_PUBLIC_BACKEND_URL + "planner/topic/")
-      .then((res) => res.json())
-      .then((data) => setAvailableTopics(data))
-      .catch((err) => console.error("Failed to load topics:", err));
+    async function fetchTopics() {
+      try {
+        const token = localStorage.getItem("access");
+        if (!token) return;
+
+        const res = await fetch(
+          process.env.NEXT_PUBLIC_BACKEND_URL + "planner/topic/",
+          {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          },
+        );
+
+        if (!res.ok) {
+          throw new Error("Failed to load topics");
+        }
+
+        const data = await res.json();
+        setAvailableTopics(data);
+      } catch (err) {
+        console.error("Failed to load topics", err);
+      }
+    }
+    fetchTopics();
   }, []);
 
   const handleSubmit = async (e: React.FormEvent) => {
@@ -66,6 +87,9 @@ export function TaskForm({ userId, onTaskCreated }: TaskFormProps) {
       const new_topics = topics
         .filter((t) => t.type === "new")
         .map((t) => ({ name: t.name, color_hex: t.color_hex }));
+
+      const validTimes = times.filter((t) => t.start_time && t.end_time);
+
       const response = await fetch(
         process.env.NEXT_PUBLIC_BACKEND_URL + "planner/tasks/",
         {
@@ -79,7 +103,7 @@ export function TaskForm({ userId, onTaskCreated }: TaskFormProps) {
             description: description,
             completed: false,
             user_id: userId,
-            times: times,
+            times: validTimes,
             existing_topic_ids: existing_topic_ids,
             new_topics: new_topics,
           }),
diff --git a/client/src/components/task_item.tsx b/client/src/components/task_item.tsx
index 34e9760..d61049f 100644
--- a/client/src/components/task_item.tsx
+++ b/client/src/components/task_item.tsx
@@ -97,6 +97,8 @@ export function TaskItem({
           color_hex: t.color_hex,
         }));
 
+      const validTimes = draftTimes.filter((t) => t.start_time && t.end_time);
+
       const response = await fetch(
         process.env.NEXT_PUBLIC_BACKEND_URL + `planner/tasks/${item.id}/`,
         {
@@ -111,7 +113,7 @@ export function TaskItem({
             completed: item.completed,
             existing_topic_ids: existing_topic_ids,
             new_topics: new_topics,
-            times: draftTimes,
+            times: validTimes,
           }),
         },
       );
diff --git a/client/src/components/task_list.tsx b/client/src/components/task_list.tsx
index 7ac4c8a..25d61db 100644
--- a/client/src/components/task_list.tsx
+++ b/client/src/components/task_list.tsx
@@ -46,7 +46,7 @@ export function TaskList({
     );
   }
   return (
-    <ul className="task-list h-fit space-y-3 w-xl">
+    <ul className="task-list w-xl h-fit space-y-3">
       {items.map((item) => (
         <li key={item.id}>
           <TaskItem
diff --git a/client/src/components/time_input.tsx b/client/src/components/time_input.tsx
index b560370..2a40e6d 100644
--- a/client/src/components/time_input.tsx
+++ b/client/src/components/time_input.tsx
@@ -1,4 +1,4 @@
-import { FaRegCalendarAlt,FaRegClock } from "react-icons/fa";
+import { FaRegCalendarAlt, FaRegClock } from "react-icons/fa";
 import { FaRegTrashCan } from "react-icons/fa6";
 
 interface Time {
@@ -25,6 +25,31 @@ const daysOfWeek = [
 ];
 
 export function TimeInput({ times, setTimes }: TimeInputProps) {
+  const addTime = () => {
+    // Add a new empty draft time only if there isn't already an empty one
+    const hasEmpty = times.some((t) => !t.start_time || !t.end_time);
+    if (!hasEmpty) {
+      setTimes([
+        ...times,
+        { id: 0, day: 1, start_time: "", end_time: "", repeating: false },
+      ]);
+    }
+  };
+
+  const updateTime = (
+    index: number,
+    field: keyof Time,
+    value: string | number | boolean,
+  ) => {
+    const newTimes = [...times];
+    newTimes[index] = { ...newTimes[index], [field]: value };
+    setTimes(newTimes);
+  };
+
+  const removeTime = (index: number) => {
+    setTimes(times.filter((_, i) => i !== index));
+  };
+
   return (
     <div className="text-md flex w-full flex-col items-center justify-center gap-2">
       <h1 className="time-input-title text-xl hover:brightness-110">Times</h1>
@@ -38,11 +63,9 @@ export function TimeInput({ times, setTimes }: TimeInputProps) {
             <select
               className="day-select h-full rounded-lg bg-indigo-400 p-1 text-center hover:brightness-110"
               value={time.day}
-              onChange={(e) => {
-                const newTimes = [...times];
-                newTimes[index].day = parseInt(e.target.value);
-                setTimes(newTimes);
-              }}
+              onChange={(e) =>
+                updateTime(index, "day", parseInt(e.target.value))
+              }
             >
               {daysOfWeek.map((day) => (
                 <option key={day.value} value={day.value}>
@@ -58,21 +81,15 @@ export function TimeInput({ times, setTimes }: TimeInputProps) {
                 className="time-input h-full rounded-lg bg-indigo-400 hover:brightness-110"
                 type="time"
                 value={time.start_time}
-                onChange={(e) => {
-                  const newTimes = [...times];
-                  newTimes[index].start_time = e.target.value;
-                  setTimes(newTimes);
-                }}
+                onChange={(e) =>
+                  updateTime(index, "start_time", e.target.value)
+                }
               />
               <input
                 className="time-input h-full rounded-lg bg-indigo-400 hover:brightness-110"
                 type="time"
                 value={time.end_time}
-                onChange={(e) => {
-                  const newTimes = [...times];
-                  newTimes[index].end_time = e.target.value;
-                  setTimes(newTimes);
-                }}
+                onChange={(e) => updateTime(index, "end_time", e.target.value)}
               />
             </div>
           </div>
@@ -82,17 +99,14 @@ export function TimeInput({ times, setTimes }: TimeInputProps) {
               className="repeat-input"
               type="checkbox"
               checked={time.repeating}
-              onChange={(e) => {
-                const newTimes = [...times];
-                newTimes[index].repeating = e.target.checked;
-                setTimes(newTimes);
-              }}
+              onChange={(e) => updateTime(index, "repeating", e.target.checked)}
             />
           </div>
+
           <button
             className="time-delete"
             type="button"
-            onClick={() => setTimes(times.filter((_, i) => i !== index))}
+            onClick={() => removeTime(index)}
           >
             <FaRegTrashCan className="hover:text-red-500" />
           </button>
@@ -101,12 +115,7 @@ export function TimeInput({ times, setTimes }: TimeInputProps) {
       <button
         className="add-time-button w-12 rounded-full bg-indigo-400 text-xl hover:brightness-110"
         type="button"
-        onClick={() =>
-          setTimes([
-            ...times,
-            { id: 0, day: 1, start_time: "", end_time: "", repeating: false },
-          ])
-        }
+        onClick={addTime}
       >
         +
       </button>
diff --git a/client/src/components/timetable.tsx b/client/src/components/timetable.tsx
index 1e090b4..92a5878 100644
--- a/client/src/components/timetable.tsx
+++ b/client/src/components/timetable.tsx
@@ -374,7 +374,7 @@ function Timetable({ timetable_tasks_props }: TimetableProps) {
     >
       <div
         id="timetable-content"
-        className="h-full w-full overflow-auto overscroll-none scrollbar"
+        className="scrollbar h-full w-full overflow-auto overscroll-none"
         onScroll={resizeAndPositionTimetableElements}
       >
         <div
diff --git a/client/src/components/ui/focus/timer.tsx b/client/src/components/ui/focus/timer.tsx
index d39e106..32e5e77 100644
--- a/client/src/components/ui/focus/timer.tsx
+++ b/client/src/components/ui/focus/timer.tsx
@@ -2,7 +2,7 @@ const Timer = (timeRemaining: number) => {
   const formatTime = (time: number) => {
     const seconds = Math.floor(time % 60);
     const minutes = Math.floor((time / 60) % 60);
-    const hours = Math.floor((time / (60 * 60)));
+    const hours = Math.floor(time / (60 * 60));
 
     return (
       <div className="countdown-display">
@@ -24,7 +24,7 @@ const Timer = (timeRemaining: number) => {
   };
 
   return (
-    <div className="rounded-full bg-indigo-400 p-3 px-8 font-inter text-xl font-semibold w-full">
+    <div className="w-full rounded-full bg-indigo-400 p-3 px-8 font-inter text-xl font-semibold">
       {formatTime(timeRemaining)}
     </div>
   );
diff --git a/client/src/pages/tasks.tsx b/client/src/pages/tasks.tsx
index 655ede3..7ddc468 100644
--- a/client/src/pages/tasks.tsx
+++ b/client/src/pages/tasks.tsx
@@ -84,10 +84,32 @@ export default function TasksPage() {
   }, [router]);
 
   useEffect(() => {
-    fetch(process.env.NEXT_PUBLIC_BACKEND_URL + "planner/topic/")
-      .then((res) => res.json())
-      .then((data) => setAvailableTopics(data))
-      .catch((err) => console.error("Failed to load topics", err));
+    async function fetchTopics() {
+      try {
+        const token = localStorage.getItem("access");
+        if (!token) return;
+
+        const res = await fetch(
+          process.env.NEXT_PUBLIC_BACKEND_URL + "planner/topic/",
+          {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          },
+        );
+
+        if (!res.ok) {
+          throw new Error("Failed to load topics");
+        }
+
+        const data = await res.json();
+        setAvailableTopics(data);
+      } catch (err) {
+        console.error("Failed to load topics", err);
+      }
+    }
+
+    fetchTopics();
   }, []);
 
   //if (loading) {
diff --git a/server/task_planner/views.py b/server/task_planner/views.py
index 3b32ef7..89de296 100644
--- a/server/task_planner/views.py
+++ b/server/task_planner/views.py
@@ -55,8 +55,11 @@ def get(self, request):
         })
 
 class TopicList(APIView):
+    authentication_classes = [JWTAuthentication]
+    permission_classes = [IsAuthenticated]
+
     def get(self, request):
-        topics = Topic.objects.all()
+        topics = Topic.objects.filter(user=request.user)
         serializer = TopicReadSerializer(topics, many=True)
         return Response(serializer.data)