diff --git a/src/fellchensammlung/static/fellchensammlung/css/styles.css b/src/fellchensammlung/static/fellchensammlung/css/styles.css
index b1a1a8c..565166b 100644
--- a/src/fellchensammlung/static/fellchensammlung/css/styles.css
+++ b/src/fellchensammlung/static/fellchensammlung/css/styles.css
@@ -4,7 +4,7 @@ html, body {
 }
 
 .content-box {
-    margin-top: 25px;
+    margin: 20px;
 }
 
 .sidebar-nav {
@@ -106,56 +106,6 @@ h1 {
     height: 40px;
 }
 
-.sidebar-nav {
-    z-index: 1;
-    top: 20px;
-    left: 10px;
-    background-color: #4ba3cd;
-    overflow-x: hidden;
-    padding: 8px 0;
-    border-top-right-radius: 5px;
-    border-bottom-right-radius: 5px;
-}
-
-.sidebar-nav-top {
-    padding-left: 0px;
-    float: left;
-}
-
-
-.sidebar-nav a {
-    padding: 6px 8px 6px 16px;
-    text-decoration: none;
-    font-size: 25px;
-    color: black;
-    display: block;
-}
-
-.sidebar-nav a:hover {
-    background-color: #4090b6;
-}
-
-.main {
-    margin-left: 160px; /* Same as the width of the sidenav */
-    font-size: 28px; /* Increased text to enable scrolling */
-    padding: 0px 10px;
-}
-
-@media screen and (max-height: 450px) {
-    .sidebar-nav {
-        padding-top: 15px;
-    }
-
-    .sidebar-nav a {
-        font-size: 18px;
-    }
-}
-
-.sidebar-nav li {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-}
 
 .btn {
     border: 2px solid #4090b6;
@@ -291,18 +241,23 @@ h1 {
 .detail-animal-header {
     border: 2px lavender solid;
     border-radius: 5px;
+    display: flex;
+    align-items: center;
+}
+
+.tag {
+    border: black 1px solid;
+    border-radius: 0.3rem;
+    padding: 2px;
+    margin: 2px;
+}
+
+.sex {
+    background: #F0DEDE;
 }
 
 .species {
-    display: inline;
-    border: darkgray 2px solid;
-    border-radius: 0.3rem;
-    background: aliceblue;
-    padding: 2px;
-}
-
-.inline {
-    display: inline;
+    background: #F8ECD7;
 }
 
 .container-list-rules {
@@ -362,6 +317,10 @@ h1 {
     border-radius: 10%;
 }
 
+.table-adoption-notice-info {
+    margin-top: 10px;
+}
+
 .animals {
     display: flex;
     flex-wrap: wrap;
@@ -370,14 +329,21 @@ h1 {
 
 .card-animal {
     flex: 1 16%;
-    margin: 10px;
+    margin: 10px 10px 10px 0px;
     border-radius: 3%;
     border: 4px grey solid;
     padding: 5px;
 }
 
+@media (max-width: 920px) {
+    .card-animal {
+        flex: 1 100%;
+    }
+}
+
 .card-animal img {
     max-width: 100%;
     border-radius: 10%;
     margin: 5px;
 }
+
diff --git a/src/fellchensammlung/templates/fellchensammlung/detail-animal-partial.html b/src/fellchensammlung/templates/fellchensammlung/detail-animal-partial.html
index 06256ae..8fee36b 100644
--- a/src/fellchensammlung/templates/fellchensammlung/detail-animal-partial.html
+++ b/src/fellchensammlung/templates/fellchensammlung/detail-animal-partial.html
@@ -1,8 +1,8 @@
 {% load static %}
 <div class="detail-animal"></div>
 <div class="detail-animal-header">
-    <h1 class="inline">{{ animal.name }}</h1>
-    <div class="species">{{ animal.species }}</div>
+    <h1>{{ animal.name }}</h1>
+    <div class="tag">{{ animal.species }}</div>
 </div>
 <div>
     <table>
diff --git a/src/fellchensammlung/templates/fellchensammlung/detail_adoption_notice.html b/src/fellchensammlung/templates/fellchensammlung/detail_adoption_notice.html
index 6de9038..7110aa9 100644
--- a/src/fellchensammlung/templates/fellchensammlung/detail_adoption_notice.html
+++ b/src/fellchensammlung/templates/fellchensammlung/detail_adoption_notice.html
@@ -4,21 +4,32 @@
 
 {% block content %}
     <div class="detail-animal-adoption-header">
-        <h1 class="inline">{{ adoption_notice.name }}</h1>
+        <h1>{{ adoption_notice.name }}</h1>
     </div>
-    <div>
+    <div class="table-adoption-notice-info">
         <table>
             <tr>
                 <th>Ort</th>
                 <th>Suchen seit</th>
             </tr>
             <tr>
-                <td>{{ adoption_notice.location.name }}, {{ adoption_notice.location.postcode }}</td>
+                {% if adoption_notice.location %}
+                    <td>{{ adoption_notice.location.name }}, {{ adoption_notice.location.postcode }}</td>
+                {% else %}
+                    <td>Kein Ort angegeben</td>
+                {% endif %}
                 <td>{{ adoption_notice.searching_since }}</td>
             </tr>
         </table>
     </div>
-    <p>{{ adoption_notice.description }}</p>
+    <p>
+        {% if adoption_notice.description %}
+            {{ adoption_notice.description }}
+        {% else %}
+            Keine Beschreibung angegeben
+        {% endif %}
+    </p>
+
     <div class="animals">
         {% for animal in adoption_notice.animals %}
             {% include "fellchensammlung/partial-animal-card.html" %}
diff --git a/src/fellchensammlung/templates/fellchensammlung/partial-animal-card.html b/src/fellchensammlung/templates/fellchensammlung/partial-animal-card.html
index 5908917..40a28ad 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partial-animal-card.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partial-animal-card.html
@@ -1,8 +1,8 @@
 <div class="card-animal">
     <div class="detail-animal-header">
-        <h1 class="inline">{{ animal.name }}</h1>
-        <div class="species">{{ animal.species }}</div>
-        <div class="species">{{ animal.get_sex_display }}</div>
+        <h1>{{ animal.name }}</h1>
+        <div class="tag species">{{ animal.species }}</div>
+        <div class="tag sex">{{ animal.get_sex_display }}</div>
     </div>
     {% if animal.get_photo %}
         <img src="/media/{{ animal.get_photo.image }}" alt="{{ animal.get_photo.alt_text }}">