diff --git a/web/pages/dogs/edit.html b/web/pages/dogs/edit.html
index af7cdd6..c767989 100644
--- a/web/pages/dogs/edit.html
+++ b/web/pages/dogs/edit.html
@@ -3,43 +3,43 @@
 
   <form id="dogeditform" hx-post="/dogs/edit" hx-encoding='multipart/form-data' hx-target="#response">
     <input type="hidden" name="dog_id" value="<?= $dogid; ?>">
-    <div>
+    <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>
-        <input type="text" value="<?= $dogdata['name']; ?>" id="name" name="name" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Max" required>
+        <input type="text" value="<?= $dogdata['name']; ?>" id="name" name="name"  class="form-control" placeholder="Max" required>
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="kennel_name" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Zuchtname</label>
-        <input type="text" value="<?= $dogdata['kennel_name']; ?>" id="kennel_name" name="kennel_name" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Zuchtname">
+        <input type="text" value="<?= $dogdata['kennel_name']; ?>" id="kennel_name" name="kennel_name"  class="form-control" placeholder="Zuchtname">
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="dog_breed" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Rasse</label>
-        <input type="text" value="<?= $dogdata['breed']; ?>" id="dog_breed" name="dog_breed" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Flowbite">
+        <input type="text" value="<?= $dogdata['breed']; ?>" id="dog_breed" name="dog_breed"  class="form-control" placeholder="Flowbite">
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="dog_size" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Größe des Hundes (in cm)</label>
-        <input type="number" value="<?= $dogdata['size']; ?>" id="dog_size" name="dog_size" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="">
+        <input type="number" value="<?= $dogdata['size']; ?>" id="dog_size" name="dog_size"  class="form-control" placeholder="">
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
       <label for="dog_birthday" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Geburtstag des Hundes</label>
-      <input type="date" value="<?= $dogdata['birthday']; ?>" id="dog_birthday" name="dog_birthday" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="" required>
+      <input type="date" value="<?= $dogdata['birthday']; ?>" id="dog_birthday" name="dog_birthday"  class="form-control" placeholder="" required>
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
       <label for="agi_active" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Hund ist noch aktiv im Sport?</label>
-      <select id="agi_active" name="agi_active" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+      <select id="agi_active" name="agi_active"  class="form-control">
         <option value="1" <?= $dogdata['active']=='1'?'selected':''; ?>>Ja</option>
         <option value="0" <?= $dogdata['active']=='0'?'selected':''; ?>>Nein</option>
       </select>
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
       <label for="agi_height_category" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Agility Größenklasse</label>
-      <select id="agi_height_category" name="agi_height_category" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
+      <select id="agi_height_category" name="agi_height_category"  class="form-control">
         <option value="S" <?= $dogdata['agility_size']=='S'?'selected':''; ?>>S</option>
         <option value="M" <?= $dogdata['agility_size']=='M'?'selected':''; ?>>M</option>
         <option value="I" <?= $dogdata['agility_size']=='I'?'selected':''; ?>>I</option>
         <option value="L" <?= $dogdata['agility_size']=='L'?'selected':''; ?>>L</option>
       </select>
     </div>
-    <div>
+    <div class="mb-3 mb-md-4">
       <label for="photo" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Photo</label>
       <input type="file" accept="image/png, image/jpeg, image/gif" id="photo" name="photo">
     </div>
diff --git a/web/pages/tournaments/edit_run.html b/web/pages/tournaments/edit_run.html
index 3a1a9e8..bfa8fe0 100644
--- a/web/pages/tournaments/edit_run.html
+++ b/web/pages/tournaments/edit_run.html
@@ -25,6 +25,11 @@
         <input type="number" value="<?= $run['max_time']; ?>" id="max_time" name="max_time" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Flowbite">
     </div>
 
+    <div class="mb-3 mb-md-4">
+        <label for="tournament_referee">Richter</label>
+        <input type="text" value="<?= $tournamentdata['referee']; ?>" id="tournament_referee" name="tournament_referee"  placeholder="Franz Ferdinand" class="form-control">
+    </div>
+
     <h2>Ergebnis</h2>
     <div>
         <label for="eliminated" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Disqualifiziert</label>
diff --git a/web/pages/tournaments/edit_tournament.html b/web/pages/tournaments/edit_tournament.html
index b8498af..62df357 100644
--- a/web/pages/tournaments/edit_tournament.html
+++ b/web/pages/tournaments/edit_tournament.html
@@ -3,41 +3,36 @@
 
   <form id="tournamenteditform" hx-post="/tournaments/edit" hx-encoding='multipart/form-data' hx-target="#response">
     <input type="hidden" name="tournament_id" value="<?= $tournamentid; ?>">
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="tournament_name">Veranstaltungsname</label>
-        <input type="text" value="<?= $tournamentdata['name']; ?>" id="tournament_name" name="tournament_name" placeholder="Agilititties" required>
+        <input type="text" value="<?= $tournamentdata['name']; ?>" id="tournament_name" name="tournament_name" placeholder="Event" class="form-control" required>
     </div>
 
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="tournament_date">Datum</label>
-        <input type="date" value="<?= $tournamentdata['date']; ?>" id="date" name="tournament_date" placeholder="Zuchtname">
+        <input type="date" value="<?= $tournamentdata['date']; ?>" id="date" name="tournament_date" class="form-control">
     </div>
 
-    <div>
-      <label for="tournament_duration">Dauer der Veranstaltung in tagen</label>
-      <input type="number" min="1" max="7" value="<?= $tournamentdata['duration']; ?>" id="tournament_duration" name="tournament_duration">
+    <div class="mb-3 mb-md-4">
+      <label for="tournament_duration">Dauer der Veranstaltung in Tagen</label>
+      <input type="number" min="1" max="7" value="<?= $tournamentdata['duration']; ?>" id="tournament_duration" name="tournament_duration" placeholder="1" class="form-control">
     </div>
 
-    <div>
-        <label for="tournament_referee">Richter</label>
-        <input type="text" value="<?= $tournamentdata['referee']; ?>" id="tournament_referee" name="tournament_referee"  placeholder="Franz Ferdinand">
-    </div>
-
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="tournament_url">Weblink</label>
-        <input type="text" value="<?= $tournamentdata['url']; ?>" id="tournament_url" name="tournament_url"  placeholder="https://facebook.com/...">
+        <input type="text" value="<?= $tournamentdata['url']; ?>" id="tournament_url" name="tournament_url"  placeholder="https://www.dognow.at/..." class="form-control">
     </div>
 
-    <div>
+    <div class="mb-3 mb-md-4">
       <label for="logo">Logo des Events</label>
-      <input type="file" accept="image/png, image/jpeg, image/gif" id="logo" name="logo">
+      <input type="file" accept="image/png, image/jpeg, image/gif" id="logo" name="logo" class="form-control">
     </div>
 
-    <div>
+    <div class="mb-3 mb-md-4">
         <label for="tournament_text">Beschreibungstext</label>
-        <textarea id="tournament_text" name="tournament_text"><?= $tournamentdata['text']; ?></textarea>
+        <textarea id="tournament_text" name="tournament_text" class="form-control"><?= $tournamentdata['text']; ?></textarea>
     </div>
-    <button type="submit" name="submit" value="true" class="btn btn-primary">Submit</button> <!-- Submit Button führt auf eine neue Seite wo man die Laufinfo eingibt -->
+    <button type="submit" name="submit" value="true" class="btn btn-primary">Weiter</button> <!-- Submit Button führt auf eine neue Seite wo man die Laufinfo eingibt -->
   </form>
   <div id="response"></div>
 </div>
\ No newline at end of file