diff --git a/frontend/src/components/Dashboard.tsx b/frontend/src/components/Dashboard.tsx
index 4ce64288..00f5a40e 100644
--- a/frontend/src/components/Dashboard.tsx
+++ b/frontend/src/components/Dashboard.tsx
@@ -76,22 +76,32 @@ const Dashboard: FC = () => {
           </tr>
         </thead>
         <tbody>
-          {data.map((user: UserDto) => (
-            <tr key={user.id}>
-              <td>{user.id}</td>
-              <td>{user.name}</td>
-              <td>{user.email}</td>
-              <td className="text-center">
-                <Button
-                  variant="secondary"
-                  size="sm"
-                  onClick={() => setSelectedUser(user)}
-                >
-                  View Details
-                </Button>
+          {data.length === 0 ? (
+            <tr>
+              <td colSpan={4} className="text-center py-3">
+                <div className="spinner-border text-primary" role="status">
+                  <span className="visually-hidden">Loading...</span>
+                </div>
               </td>
             </tr>
-          ))}
+          ) : (
+            data.map((user: UserDto) => (
+              <tr key={user.id}>
+                <td>{user.id}</td>
+                <td>{user.name}</td>
+                <td>{user.email}</td>
+                <td className="text-center">
+                  <Button
+                    variant="secondary"
+                    size="sm"
+                    onClick={() => setSelectedUser(user)}
+                  >
+                    View Details
+                  </Button>
+                </td>
+              </tr>
+            ))
+          )}
         </tbody>
       </Table>
       <ModalComponent
diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx
index 6813a88f..68da4c77 100644
--- a/frontend/src/components/Layout.tsx
+++ b/frontend/src/components/Layout.tsx
@@ -10,7 +10,7 @@ type Props = {
 const Layout: FC<Props> = ({ children }) => {
   return (
     <div className="d-flex flex-column min-vh-100">
-      <Header title={'QuickStart AWS'}>
+      <Header title={'QuickStart AWS Containers'}>
         {' '}
         <Link to="/">
           <Button variant="light" size="lg">