diff --git a/web/pages/dogs/edit.html b/web/pages/dogs/edit.html
index c767989..c89750b 100644
--- a/web/pages/dogs/edit.html
+++ b/web/pages/dogs/edit.html
@@ -1,7 +1,7 @@
 <div>
   <h1>Hund <?= $dogid?'Bearbeiten':'Hinzufügen'; ?></h1>
 
-  <form id="dogeditform" hx-post="/dogs/edit" hx-encoding='multipart/form-data' hx-target="#response">
+  <form id="dogeditform" hx-post="/dogs/edit" hx-encoding='multipart/form-data' hx-target="#response" class="row row-cols-2">
     <input type="hidden" name="dog_id" value="<?= $dogid; ?>">
     <div class="mb-3 mb-md-4">
         <label for="name" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Name</label>
diff --git a/web/pages/dogs/list.html b/web/pages/dogs/list.html
index ebc8827..bcd21e6 100644
--- a/web/pages/dogs/list.html
+++ b/web/pages/dogs/list.html
@@ -1,60 +1,26 @@
 <h1>Meine Hunde</h1>
-
-
 <figure>
     <table class="table">
         <thead>
             <tr>
-                <th>
-                    Foto
-                </th>
-                <th>
-                    Name
-                </th>
-                <th>
-                    Geburstag
-                </th>
-
-                <th>
-                    Aktiv
-                </th>
-
-                <th>
-                    Bearbeiten
-                </th>
-                <th>
-                    Löschen
-                </th>
+                <th>Foto</th>
+                <th>Name</th>
+                <th>Geburstag</th>
+                <th>Aktiv</th>
+                <th>Bearbeiten</th>
+                <th>Löschen</th>
             </tr>
         </thead>
         <tbody>
             <?php foreach ($doggos as $dog) : ?>
-
-            <tr>
-                <td>
-                    <img src="<?= $dog['photo'] ?>/50x50/forcesize">
-                </td>
-
-                <td>
-                    <?= escape($dog['name']); ?>
-                </td>
-
-                <td>
-                    <?= escape($dog['birthday']); ?>
-                </td>
-
-                <td>
-                    <?= escape($dog['active'])?'Ja':'Nein'; ?>
-                </td>
-
-                <td>
-                    <button hx-get="/dogs/edit/<?= $dog['id'] ?>" hx-push-url="/dogs/edit/<?= $dog['id'] ?>" hx-target="#main" >Bearbeiten</button>
-                </td>
-                <td>
-                    <button hx-get="/dogs/delete/<?= $dog['id'] ?>" hx-target="#main" hx-confirm="Bist du sicher, dass du <?= escape($dog['name']); ?> löschen willst">Löschen</button>
-                </td>
-            </tr>
-
+                <tr>
+                    <td><img src="<?= $dog['photo'] ?>/50x50/forcesize"></td>
+                    <td><?= escape($dog['name']); ?></td>
+                    <td><?= escape($dog['birthday']); ?></td>
+                    <td><?= escape($dog['active'])?'Ja':'Nein'; ?></td>
+                    <td><button hx-get="/dogs/edit/<?= $dog['id'] ?>" hx-push-url="/dogs/edit/<?= $dog['id'] ?>" hx-target="#main" class="btn btn-primary"><i class="fas fa-edit"></i></button></td>
+                    <td><button hx-get="/dogs/delete/<?= $dog['id'] ?>" hx-target="#main" hx-confirm="Bist du sicher, dass du <?= escape($dog['name']); ?> löschen willst" class="btn btn-danger"><i class="fas fa-trash"></i></button></td>
+                </tr>
             <?php endforeach; ?>
         </tbody>
     </table>
diff --git a/web/pages/profile/edit_profile.html b/web/pages/profile/edit_profile.html
index d83a112..3bf56b4 100644
--- a/web/pages/profile/edit_profile.html
+++ b/web/pages/profile/edit_profile.html
@@ -1,7 +1,7 @@
 <div>
   <h1>Mein Profil bearbeiten</h1>
 
-  <form id="dogeditform" hx-post="/profile/edit" hx-encoding='multipart/form-data' hx-target="#response">
+  <form id="dogeditform" hx-post="/profile/edit" hx-encoding='multipart/form-data' hx-target="#response" class="row row-cols-2">
     <div>
         <label for="firstname">Vorname</label>
         <input type="text" value="<?= $user['firstname']; ?>" id="firstname" name="firstname"  class="form-control" placeholder="Max">