diff --git a/frontend/src/pages/PartDetails.tsx b/frontend/src/pages/PartDetails.tsx
index 2344a327..6edacb68 100644
--- a/frontend/src/pages/PartDetails.tsx
+++ b/frontend/src/pages/PartDetails.tsx
@@ -8,6 +8,7 @@ import {
   ButtonGroup,
   Carousel,
   Col,
+  Container,
   Modal,
   Row,
   Spinner,
@@ -63,7 +64,19 @@ const PartDetails = () => {
   }, [error]);
 
   if (!part) {
-    return <Spinner animation="border" />;
+    return (
+      <Container
+        fluid
+        className="d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <Row className="w-100">
+          <Col className="d-flex justify-content-center align-items-center">
+            <Spinner animation="border" />
+          </Col>
+        </Row>
+      </Container>
+    );
   }
 
   const response: PartDetailsResponse = {
diff --git a/frontend/src/pages/Parts.tsx b/frontend/src/pages/Parts.tsx
index 0cd3b40f..8145808c 100644
--- a/frontend/src/pages/Parts.tsx
+++ b/frontend/src/pages/Parts.tsx
@@ -2,7 +2,14 @@ import { useAlertQueue } from "hooks/alerts";
 import { api, Part } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
+import {
+  Breadcrumb,
+  Card,
+  Col,
+  Container,
+  Row,
+  Spinner,
+} from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 import { isFulfilled } from "utils/isfullfiled";
 
@@ -59,7 +66,19 @@ const Parts = () => {
   }, [error]);
 
   if (!partsData) {
-    return <Spinner animation="border" />;
+    return (
+      <Container
+        fluid
+        className="d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <Row className="w-100">
+          <Col className="d-flex justify-content-center align-items-center">
+            <Spinner animation="border" />
+          </Col>
+        </Row>
+      </Container>
+    );
   }
 
   return (
diff --git a/frontend/src/pages/RobotDetails.tsx b/frontend/src/pages/RobotDetails.tsx
index ee426998..69e00745 100644
--- a/frontend/src/pages/RobotDetails.tsx
+++ b/frontend/src/pages/RobotDetails.tsx
@@ -8,6 +8,7 @@ import {
   ButtonGroup,
   Carousel,
   Col,
+  Container,
   Modal,
   Row,
   Spinner,
@@ -97,7 +98,19 @@ const RobotDetails = () => {
   }, [error]);
 
   if (!robot) {
-    return <Spinner animation="border" />;
+    return (
+      <Container
+        fluid
+        className="d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <Row className="w-100">
+          <Col className="d-flex justify-content-center align-items-center">
+            <Spinner animation="border" />
+          </Col>
+        </Row>
+      </Container>
+    );
   }
   const response: RobotDetailsResponse = {
     name: robot?.name,
diff --git a/frontend/src/pages/Robots.tsx b/frontend/src/pages/Robots.tsx
index c02c4811..31576c7a 100644
--- a/frontend/src/pages/Robots.tsx
+++ b/frontend/src/pages/Robots.tsx
@@ -1,7 +1,14 @@
 import { api, Robot } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
+import {
+  Breadcrumb,
+  Card,
+  Col,
+  Container,
+  Row,
+  Spinner,
+} from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 import { isFulfilled } from "utils/isfullfiled";
 
@@ -52,7 +59,19 @@ const Robots = () => {
   }, [error, navigate]);
 
   if (!robotsData) {
-    return <Spinner animation="border" />;
+    return (
+      <Container
+        fluid
+        className="d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <Row className="w-100">
+          <Col className="d-flex justify-content-center align-items-center">
+            <Spinner animation="border" />
+          </Col>
+        </Row>
+      </Container>
+    );
   }
 
   return (
diff --git a/frontend/src/pages/YourParts.tsx b/frontend/src/pages/YourParts.tsx
index 6f9531aa..3871897c 100644
--- a/frontend/src/pages/YourParts.tsx
+++ b/frontend/src/pages/YourParts.tsx
@@ -1,7 +1,14 @@
 import { api, Part } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
+import {
+  Breadcrumb,
+  Card,
+  Col,
+  Container,
+  Row,
+  Spinner,
+} from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 
 const YourParts = () => {
@@ -34,7 +41,19 @@ const YourParts = () => {
   }, [error, navigate]);
 
   if (!partsData) {
-    return <Spinner animation="border" />;
+    return (
+      <Container
+        fluid
+        className="d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <Row className="w-100">
+          <Col className="d-flex justify-content-center align-items-center">
+            <Spinner animation="border" />
+          </Col>
+        </Row>
+      </Container>
+    );
   }
 
   return (
diff --git a/frontend/src/pages/YourRobots.tsx b/frontend/src/pages/YourRobots.tsx
index f114214f..fb046d0c 100644
--- a/frontend/src/pages/YourRobots.tsx
+++ b/frontend/src/pages/YourRobots.tsx
@@ -1,7 +1,14 @@
 import { api, Robot } from "hooks/api";
 import { useAuthentication } from "hooks/auth";
 import { useEffect, useState } from "react";
-import { Breadcrumb, Card, Col, Row, Spinner } from "react-bootstrap";
+import {
+  Breadcrumb,
+  Card,
+  Col,
+  Container,
+  Row,
+  Spinner,
+} from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 
 const YourRobots = () => {
@@ -35,7 +42,19 @@ const YourRobots = () => {
   }, [error, navigate]);
 
   if (!robotsData) {
-    return <Spinner animation="border" />;
+    return (
+      <Container
+        fluid
+        className="d-flex justify-content-center align-items-center"
+        style={{ height: "100vh" }}
+      >
+        <Row className="w-100">
+          <Col className="d-flex justify-content-center align-items-center">
+            <Spinner animation="border" />
+          </Col>
+        </Row>
+      </Container>
+    );
   }
 
   return (