diff --git a/app/src/ui/elements/auth/AuthForm.tsx b/app/src/ui/elements/auth/AuthForm.tsx
index 02d6706..2753c46 100644
--- a/app/src/ui/elements/auth/AuthForm.tsx
+++ b/app/src/ui/elements/auth/AuthForm.tsx
@@ -10,7 +10,6 @@ import { SocialLink } from "./SocialLink";
 import type { ValueError } from "@sinclair/typebox/value";
 import { type TSchema, Value } from "core/utils";
 import type { Validator } from "json-schema-form-react";
-import { useTheme } from "ui/client/use-theme";
 
 class TypeboxValidator implements Validator<ValueError> {
    async validate(schema: TSchema, data: any) {
@@ -46,7 +45,6 @@ export function AuthForm({
    buttonLabel = action === "login" ? "Sign in" : "Sign up",
    ...props
 }: LoginFormProps) {
-   const { theme } = useTheme();
    const basepath = auth?.basepath ?? "/api/auth";
    const password = {
       action: `${basepath}/password/${action}`,
diff --git a/app/src/ui/routes/data/data.$entity.$id.tsx b/app/src/ui/routes/data/data.$entity.$id.tsx
index e042934..ba8e989 100644
--- a/app/src/ui/routes/data/data.$entity.$id.tsx
+++ b/app/src/ui/routes/data/data.$entity.$id.tsx
@@ -164,26 +164,36 @@ export function DataEntityUpdate({ params }) {
                ]}
             />
          </AppShell.SectionHeader>
-         <AppShell.Scrollable>
-            {error && (
-               <div className="flex flex-row dark:bg-red-950 bg-red-100 p-4">
-                  <b className="mr-2">Update failed: </b> {error}
-               </div>
-            )}
-            <EntityForm
-               entity={entity}
-               entityId={entityId}
-               handleSubmit={handleSubmit}
-               fieldsDisabled={fieldsDisabled}
-               data={data ?? undefined}
-               Form={Form}
-               action="update"
-               className="flex flex-grow flex-col gap-3 p-3"
-            />
-            {targetRelations.length > 0 ? (
-               <EntityDetailRelations id={entityId} entity={entity} relations={targetRelations} />
-            ) : null}
-         </AppShell.Scrollable>
+         {$q.isLoading ? (
+            <div className="w-full h-full flex justify-center items-center font-mono opacity-30">
+               Loading...
+            </div>
+         ) : (
+            <AppShell.Scrollable>
+               {error && (
+                  <div className="flex flex-row dark:bg-red-950 bg-red-100 p-4">
+                     <b className="mr-2">Update failed: </b> {error}
+                  </div>
+               )}
+               <EntityForm
+                  entity={entity}
+                  entityId={entityId}
+                  handleSubmit={handleSubmit}
+                  fieldsDisabled={fieldsDisabled}
+                  data={data ?? undefined}
+                  Form={Form}
+                  action="update"
+                  className="flex flex-grow flex-col gap-3 p-3"
+               />
+               {targetRelations.length > 0 ? (
+                  <EntityDetailRelations
+                     id={entityId}
+                     entity={entity}
+                     relations={targetRelations}
+                  />
+               ) : null}
+            </AppShell.Scrollable>
+         )}
       </Fragment>
    );
 }