diff --git a/frontend/src/pages/PartDetails.tsx b/frontend/src/pages/PartDetails.tsx
index 06743500..305cd071 100644
--- a/frontend/src/pages/PartDetails.tsx
+++ b/frontend/src/pages/PartDetails.tsx
@@ -9,6 +9,7 @@ import {
   Col,
   Modal,
   Row,
+  Spinner,
 } from "react-bootstrap";
 import Markdown from "react-markdown";
 import { useNavigate, useParams } from "react-router-dom";
@@ -60,7 +61,7 @@ const PartDetails = () => {
   }, [error, navigate]);
 
   if (!part) {
-    return <p>Loading</p>;
+    return <Spinner animation="border" />;
   }
 
   const response: PartDetailsResponse = {
diff --git a/frontend/src/pages/Parts.tsx b/frontend/src/pages/Parts.tsx
index 57e30f14..95ccbad5 100644
--- a/frontend/src/pages/Parts.tsx
+++ b/frontend/src/pages/Parts.tsx
@@ -1,7 +1,7 @@
 import { api, Part } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row } from "react-bootstrap";
+import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 
 const Parts = () => {
@@ -45,7 +45,7 @@ const Parts = () => {
   }, [error, navigate]);
 
   if (!partsData) {
-    return <p>Loading</p>;
+    return <Spinner animation="border" />;
   }
 
   return (
diff --git a/frontend/src/pages/RobotDetails.tsx b/frontend/src/pages/RobotDetails.tsx
index b38f1396..2f41731f 100644
--- a/frontend/src/pages/RobotDetails.tsx
+++ b/frontend/src/pages/RobotDetails.tsx
@@ -9,6 +9,7 @@ import {
   Col,
   Modal,
   Row,
+  Spinner,
 } from "react-bootstrap";
 import Markdown from "react-markdown";
 import { Link, useNavigate, useParams } from "react-router-dom";
@@ -89,7 +90,7 @@ const RobotDetails = () => {
   }, [error, navigate]);
 
   if (!robot) {
-    return <p>Loading</p>;
+    return <Spinner animation="border" />;
   }
   const response: RobotDetailsResponse = {
     name: robot?.name,
diff --git a/frontend/src/pages/Robots.tsx b/frontend/src/pages/Robots.tsx
index 2d000b50..ff6fdb9c 100644
--- a/frontend/src/pages/Robots.tsx
+++ b/frontend/src/pages/Robots.tsx
@@ -1,7 +1,7 @@
 import { api, Robot } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row } from "react-bootstrap";
+import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 
 const Robots = () => {
@@ -45,7 +45,7 @@ const Robots = () => {
   }, [error, navigate]);
 
   if (!robotsData) {
-    return <p>Loading</p>;
+    return <Spinner animation="border" />;
   }
 
   return (
diff --git a/frontend/src/pages/YourParts.tsx b/frontend/src/pages/YourParts.tsx
index 0e507dbd..6f9531aa 100644
--- a/frontend/src/pages/YourParts.tsx
+++ b/frontend/src/pages/YourParts.tsx
@@ -1,7 +1,7 @@
 import { api, Part } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row } from "react-bootstrap";
+import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 
 const YourParts = () => {
@@ -34,7 +34,7 @@ const YourParts = () => {
   }, [error, navigate]);
 
   if (!partsData) {
-    return <p>Loading</p>;
+    return <Spinner animation="border" />;
   }
 
   return (
diff --git a/frontend/src/pages/YourRobots.tsx b/frontend/src/pages/YourRobots.tsx
index cba4f5ae..f114214f 100644
--- a/frontend/src/pages/YourRobots.tsx
+++ b/frontend/src/pages/YourRobots.tsx
@@ -1,7 +1,7 @@
 import { api, Robot } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row } from "react-bootstrap";
+import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 
 const YourRobots = () => {
@@ -35,7 +35,7 @@ const YourRobots = () => {
   }, [error, navigate]);
 
   if (!robotsData) {
-    return <p>Loading {robotsData} </p>;
+    return <Spinner animation="border" />;
   }
 
   return (