diff --git a/src/components/loading.rs b/src/components/loading.rs
index ee11ded..8c8a18c 100644
--- a/src/components/loading.rs
+++ b/src/components/loading.rs
@@ -3,7 +3,7 @@ use leptos::prelude::*;
 #[component]
 pub fn Loading() -> impl IntoView {
     view! {
-        <div class="size-20 mx-auto">
+        <div class="size-20 mx-auto mt-20">
             <img src="/loading.gif" />
         </div>
     }
diff --git a/src/pages/student/academics_page.rs b/src/pages/student/academics_page.rs
index 559aa7b..f254903 100644
--- a/src/pages/student/academics_page.rs
+++ b/src/pages/student/academics_page.rs
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use crate::components::{OutlinedTextField, TextFieldType, ValidatedForm};
+use crate::components::{Loading, OutlinedTextField, TextFieldType, ValidatedForm};
 use crate::pages::student::form_setup::use_student_form;
 
 #[component]
@@ -7,51 +7,56 @@ pub fn StudentAcademicsPage() -> impl IntoView {
     let controller = use_student_form("academics");
 
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="Academic Information" on_submit=controller.submit_action>
-                <OutlinedTextField
-                    label="Unweighted GPA:"
-                    data_map=controller.data_map
-                    data_member="unweighted_gpa"
-                    placeholder="4.0"
-                    required=true
-                    input_type=TextFieldType::Number
-                />
-                <OutlinedTextField
-                    label="Weighted GPA:"
-                    data_map=controller.data_map
-                    data_member="weighted_gpa"
-                    placeholder="4.5"
-                    required=true
-                    input_type=TextFieldType::Number
-                />
-                <OutlinedTextField
-                    label="Highest SAT Score:"
-                    data_map=controller.data_map
-                    data_member="sat_score"
-                    placeholder="1600"
-                    required=false
-                    input_type=TextFieldType::Number
-                />
-                <OutlinedTextField
-                    label="Highest ACT Score:"
-                    data_map=controller.data_map
-                    data_member="act_score"
-                    placeholder="36"
-                    required=false
-                    input_type=TextFieldType::Number
-                />
-                <OutlinedTextField
-                    label="Academic Honors:"
-                    data_map=controller.data_map
-                    data_member="academic_honors"
-                    placeholder="TBD"
-                    required=false
-                    input_type=TextFieldType::Text
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+        <Show 
+            when=move || controller.data_resource.get().is_some()
+            fallback=Loading
+        >
+            <div class="flex flex-1" />
+            <div class="flex flex-col flex-2 mt-6">
+                <ValidatedForm title="Academic Information" on_submit=controller.submit_action>
+                    <OutlinedTextField
+                        label="Unweighted GPA:"
+                        data_map=controller.data_map
+                        data_member="unweighted_gpa"
+                        placeholder="4.0"
+                        required=true
+                        input_type=TextFieldType::Number
+                    />
+                    <OutlinedTextField
+                        label="Weighted GPA:"
+                        data_map=controller.data_map
+                        data_member="weighted_gpa"
+                        placeholder="4.5"
+                        required=true
+                        input_type=TextFieldType::Number
+                    />
+                    <OutlinedTextField
+                        label="Highest SAT Score:"
+                        data_map=controller.data_map
+                        data_member="sat_score"
+                        placeholder="1600"
+                        required=false
+                        input_type=TextFieldType::Number
+                    />
+                    <OutlinedTextField
+                        label="Highest ACT Score:"
+                        data_map=controller.data_map
+                        data_member="act_score"
+                        placeholder="36"
+                        required=false
+                        input_type=TextFieldType::Number
+                    />
+                    <OutlinedTextField
+                        label="Academic Honors:"
+                        data_map=controller.data_map
+                        data_member="academic_honors"
+                        placeholder="TBD"
+                        required=false
+                        input_type=TextFieldType::Text
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
\ No newline at end of file
diff --git a/src/pages/student/athletics_page.rs b/src/pages/student/athletics_page.rs
index 055f814..b311f1a 100644
--- a/src/pages/student/athletics_page.rs
+++ b/src/pages/student/athletics_page.rs
@@ -1,5 +1,5 @@
 use leptos::prelude::*;
-use crate::components::{MultiEntry, ValidatedForm};
+use crate::components::{Loading, MultiEntry, ValidatedForm};
 use crate::input;
 use crate::pages::student::form_setup::use_student_form;
 
@@ -8,50 +8,55 @@ pub fn StudentAthleticsPage() -> impl IntoView {
     let controller = use_student_form("athletics");
 
     view! {
-        <div class="flex flex-1" />
-        <div class="flex flex-col flex-2 mt-6">
-            <ValidatedForm title="Athletics Information" on_submit=controller.submit_action>
-                <MultiEntry
-                    label="Athletics Activities:"
-                    description="Leave blank if not applicable."
-                    data_map=controller.data_map
-                    data_member="athletic_participation"
-                    schema=vec![
-                        input!(
-                            Select, "sport_name", "Sport Name:", true, [
-                            "Football",
-                            "Soccer",
-                            "Cheerleading",
-                            "Field Hockey",
-                            "Swimming",
-                            "Golf",
-                            "Basketball",
-                            "Track",
-                            "Gymnastics",
-                            "Ice Hockey",
-                            "Ski",
-                            "Wrestling",
-                            "Lacrosse",
-                            "Softball",
-                            "Tennis",
-                            "Baseball"
+        <Show 
+            when=move || controller.data_resource.get().is_some()
+            fallback=Loading
+        >
+            <div class="flex flex-1" />
+            <div class="flex flex-col flex-2 mt-6">
+                <ValidatedForm title="Athletics Information" on_submit=controller.submit_action>
+                    <MultiEntry
+                        label="Athletics Activities:"
+                        description="Leave blank if not applicable."
+                        data_map=controller.data_map
+                        data_member="athletic_participation"
+                        schema=vec![
+                            input!(
+                                Select, "sport_name", "Sport Name:", true, [
+                                "Football",
+                                "Soccer",
+                                "Cheerleading",
+                                "Field Hockey",
+                                "Swimming",
+                                "Golf",
+                                "Basketball",
+                                "Track",
+                                "Gymnastics",
+                                "Ice Hockey",
+                                "Ski",
+                                "Wrestling",
+                                "Lacrosse",
+                                "Softball",
+                                "Tennis",
+                                "Baseball"
+                            ]
+                            ),
+                            input!(
+                                Checkbox, "grades", "Grades Participated:", true, [
+                                "9th",
+                                "10th",
+                                "11th",
+                                "12th"
+                            ]
+                            ),
+                            input!(
+                                Text, "achievements", "Special Achievements:", false, "Example 1, Example 2, etc..."
+                            ),
                         ]
-                        ),
-                        input!(
-                            Checkbox, "grades", "Grades Participated:", true, [
-                            "9th",
-                            "10th",
-                            "11th",
-                            "12th"
-                        ]
-                        ),
-                        input!(
-                            Text, "achievements", "Special Achievements:", false, "Example 1, Example 2, etc..."
-                        ),
-                    ]
-                />
-            </ValidatedForm>
-        </div>
-        <div class="flex flex-1" />
+                    />
+                </ValidatedForm>
+            </div>
+            <div class="flex flex-1" />
+        </Show>
     }
 }
\ No newline at end of file