diff --git a/website/src/pages/create/assistant_reply.tsx b/website/src/pages/create/assistant_reply.tsx
index 81c2624a..a7f058f8 100644
--- a/website/src/pages/create/assistant_reply.tsx
+++ b/website/src/pages/create/assistant_reply.tsx
@@ -40,14 +40,14 @@ const AssistantReply = () => {
     });
   };
 
-  if (true) {
-    return (<LoadingScreen text="Loading..."/>);
+  if (isLoading) {
+    return <LoadingScreen text="Loading..." />;
   }
+
   if (tasks.length == 0) {
     return <div className="p-6 bg-slate-100 text-gray-800">No tasks found...</div>;
   }
 
-
   const task = tasks[0].task;
   return (
     <div className="p-6 bg-slate-100 text-gray-800">
diff --git a/website/src/pages/create/summarize_story.tsx b/website/src/pages/create/summarize_story.tsx
index 145e3ede..208f9285 100644
--- a/website/src/pages/create/summarize_story.tsx
+++ b/website/src/pages/create/summarize_story.tsx
@@ -51,8 +51,9 @@ const SummarizeStory = () => {
   };
 
   if (isLoading) {
-    return (<LoadingScreen text="Loading..."/>);
+    return <LoadingScreen text="Loading..." />;
   }
+
   if (tasks.length == 0) {
     return <div className="p-6 bg-slate-100 text-gray-800">No tasks found...</div>;
   }
diff --git a/website/src/pages/create/user_reply.tsx b/website/src/pages/create/user_reply.tsx
index 5e5b052d..18427c71 100644
--- a/website/src/pages/create/user_reply.tsx
+++ b/website/src/pages/create/user_reply.tsx
@@ -40,14 +40,10 @@ const UserReply = () => {
     });
   };
 
-
   if (isLoading) {
-    return (<LoadingScreen text="Loading..."/>);
+    return <LoadingScreen text="Loading..." />;
   }
 
-  /**
-   * TODO: Make this a nicer loading screen.
-   */
   if (tasks.length == 0) {
     return <div className="p-6 bg-slate-100 text-gray-800">No tasks found...</div>;
   }
diff --git a/website/src/pages/evaluate/rank_initial_prompts.tsx b/website/src/pages/evaluate/rank_initial_prompts.tsx
index 1f62b67e..1c7ac361 100644
--- a/website/src/pages/evaluate/rank_initial_prompts.tsx
+++ b/website/src/pages/evaluate/rank_initial_prompts.tsx
@@ -46,11 +46,13 @@ const RankInitialPrompts = () => {
   };
 
   if (isLoading) {
-    return (<LoadingScreen text="Loading..."/>);
+    return <LoadingScreen text="Loading..." />;
   }
+
   if (tasks.length == 0) {
     return <div className="p-6 bg-slate-100 text-gray-800">No tasks found...</div>;
   }
+
   const prompts = tasks[0].task.prompts as string[];
   const items = ranking.map((i) => ({
     text: prompts[i],
diff --git a/website/src/pages/evaluate/rate_summary.tsx b/website/src/pages/evaluate/rate_summary.tsx
index 557b87ec..6ff74c37 100644
--- a/website/src/pages/evaluate/rate_summary.tsx
+++ b/website/src/pages/evaluate/rate_summary.tsx
@@ -51,8 +51,9 @@ const RateSummary = () => {
   };
 
   if (isLoading) {
-    return (<LoadingScreen text="Loading..."/>);
+    return <LoadingScreen text="Loading..." />;
   }
+
   if (tasks.length == 0) {
     return <div className="p-6 bg-slate-100 text-gray-800">No tasks found...</div>;
   }