diff --git a/core/settings.py b/core/settings.py
index d5940ee..da38096 100644
--- a/core/settings.py
+++ b/core/settings.py
@@ -40,7 +40,7 @@
 
 ALLOWED_HOSTS = ["cmp-production.up.railway.app", "*"]
 
-CSRF_TRUSTED_ORIGINS = ["https://cmp-production.up.railway.app"]
+CSRF_TRUSTED_ORIGINS = ["https://cmp-production.up.railway.app", "https://cmp.oxenfor.de" ]
 
 INTERNAL_IPS = [
     # ...
diff --git a/templates/cmp/cemeteries.html b/templates/cmp/cemeteries.html
index 2dc1c0c..f3b7a37 100644
--- a/templates/cmp/cemeteries.html
+++ b/templates/cmp/cemeteries.html
@@ -3,6 +3,7 @@
 {% block title %}Cemeteries {% endblock %}
 {% block content %}
 
+<div class="center-content">
 <h1>Cemeteries</h1>
 
 <table>
@@ -27,6 +28,5 @@ <h1>Cemeteries</h1>
       {% endfor %}
     </tbody>
   </table>
-
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+<div>
\ No newline at end of file
diff --git a/templates/cmp/edit-cemeteries.html b/templates/cmp/edit-cemeteries.html
index 83b9dba..cfbcb9b 100644
--- a/templates/cmp/edit-cemeteries.html
+++ b/templates/cmp/edit-cemeteries.html
@@ -3,16 +3,16 @@
 {% block title %}Cemeteries Form{% endblock %}
 {% block content %}
 
-<h1>Edit Cemetery</h1>
-<div>
-    <form method="POST">
-        {% csrf_token %}
-        {{ form.management_form }}
-        {{ form.errors }}
-        {{form | crispy}}
-        <button type="submit" class="btn btn-primary">Save</button>
-    </form>
-
+<div class="center-content">
+    <h3>Edit Cemetery</h3>
+    <div>
+        <form method="POST">
+            {% csrf_token %}
+            {{ form.management_form }}
+            {{ form.errors }}
+            {{form | crispy}}
+            <button type="submit" class="btn btn-primary">Save</button>
+        </form>
     </div>
-
-{% endblock %}
\ No newline at end of file
+    {% endblock %}
+</div>
\ No newline at end of file
diff --git a/templates/cmp/edit-companies.html b/templates/cmp/edit-companies.html
index dbf460a..4edfe88 100644
--- a/templates/cmp/edit-companies.html
+++ b/templates/cmp/edit-companies.html
@@ -1,17 +1,20 @@
 {% extends "base.html" %}
 {% load static crispy_forms_tags %}
-{% block title %}Decorations Form{% endblock %}
+{% block title %}Companies Form{% endblock %}
 {% block content %}
 
-<h1>Edit Decoration</h1>
-<div>
-    <form method="POST">
-        {% csrf_token %}
-        {{ form.management_form }}
-        {{ form.errors }}
-        {{form | crispy}}
-        <button type="submit" class="btn btn-primary">Save</button>
-    </form>
-</div>
+<div class="center-content">
+<h3>Edit Companies</h3>
 
-{% endblock %}
\ No newline at end of file
+    <div>
+        <form method="POST">
+            {% csrf_token %}
+            {{ form.management_form }}
+            {{ form.errors }}
+            {{form | crispy}}
+            <button type="submit" class="btn btn-primary">Save</button>
+        </form>
+    </div>
+
+{% endblock %}
+</div>  
\ No newline at end of file
diff --git a/templates/cmp/edit-countries.html b/templates/cmp/edit-countries.html
index 74cccf5..38406ff 100644
--- a/templates/cmp/edit-countries.html
+++ b/templates/cmp/edit-countries.html
@@ -3,7 +3,8 @@
 {% block title %}Country Form{% endblock %}
 {% block content %}
 
-<h1>Edit Country Details</h1>
+<div class="center-content">
+<h3>Edit Country Details</h3>
 
 <div>
     <form method="POST">
@@ -11,9 +12,9 @@ <h1>Edit Country Details</h1>
         {{ form.management_form }}
         {{ form.errors }}
         {{form | crispy}}
-        <button type="submit" class="btn btn-primary">Save</button>
+        <button type="submit" class="btn btn-primary">SAVE</button>
     </form>
+</div>
 
-    </div>
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
\ No newline at end of file
diff --git a/templates/cmp/search-cemeteries.html b/templates/cmp/search-cemeteries.html
index 03b8b7e..01d41a6 100644
--- a/templates/cmp/search-cemeteries.html
+++ b/templates/cmp/search-cemeteries.html
@@ -3,23 +3,35 @@
 {% block title %}Cemeteries{% endblock %}
 {% block content %}
 
-<h1> Search Cemeteries</h1>
+   <div class="center-content">
+   <h3> Search Cemeteries</h3>
 
-<div name="search-input" class="search-input">
-<form method="get">
-  <input type="text" name="q" placeholder="Search Cemeteries to edit">
-  <input type="submit" value="Search">
-</form>
-</div>
+   <div name="search-input" class="search-input">
+   <form method="get">
+     <input type="text" name="q" placeholder="Search Cemeteries ">
+     <input type="submit" value="Search">
+   </form>
+   </div>
 
 
-<div>
-{% for cemetery in cemeteries %}
-    <p>
-        <a href="{% url 'edit-cemeteries' cemetery.id %}">{{ cemetery.name }}</a>
-    </p>
-{% endfor %}
-</div>
+   <div>
+    <table class="content-table">
+      <thead class="">
+        <tr>
+          <th></th>
+          <th>NAME</th>
+          <th>COUNTRY</th>
+        </tr>
+      </thead>
 
+   {% for cemetery in cemeteries %}
+   <tr>
+    <td><button class="glossy-button" onclick="location.href='{% url 'edit-cemeteries' cemetery.id %}'" type="button">EDIT</button></td>
+    <td><span class="soldier-info">{{ cemetery.name }}</span></td>
+    <td><span class="soldier-info">{{ cemetery.country.name }} {{cemetery.country.flag}} </span></td>
+  </tr>
+   {% endfor %}
+   </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
\ No newline at end of file
diff --git a/templates/cmp/search-companies.html b/templates/cmp/search-companies.html
index 650d4ba..107b7cc 100644
--- a/templates/cmp/search-companies.html
+++ b/templates/cmp/search-companies.html
@@ -3,7 +3,8 @@
 {% block title %}Companies{% endblock %}
 {% block content %}
 
-<h1>Search Companies</h1>
+<div class="center-content">
+<h3>Search Companies</h3>
 
 <div name="search-input" class="search-input">
 <form method="get">
@@ -13,17 +14,26 @@ <h1>Search Companies</h1>
 </div>
 
 <div>
-{% for company in page_obj %}
-<p class="soldier-details">
-  <button class="glossy-button" onclick="location.href='{% url 'edit-companies' company.id %}'" type="button">Edit</button> 
-  <span class="soldier-info">{{ company.name}} </span>
-</p>
-{% endfor %}
-</div>
+  <table class="content-table">
+    <thead class="">
+      <tr>
+        <th></th>
+        <th>NAME</th>
+      </tr>
+    </thead>
+
+   {% for company in page_obj %}
+   <tr>
+    <td><button class="glossy-button" onclick="location.href='{% url 'edit-companies' company.id %}'" type="button">EDIT</button></td>
+    <td><span class="soldier-info">{{ company.name }}</span></td>
+  </tr>
+
+   {% endfor %}
+   </table>
+   </div>
 
 <p>Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}</p>
 
-
 {% if page_obj.has_previous %}
     <a href="?q={{ request.GET.q }}&page={{ page_obj.previous_page_number }}">Previous</a>
 {% endif %}
@@ -32,4 +42,6 @@ <h1>Search Companies</h1>
     <a href="?q={{ request.GET.q }}&page={{ page_obj.next_page_number }}">Next</a>
 {% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
+kk
\ No newline at end of file
diff --git a/templates/cmp/search-countries.html b/templates/cmp/search-countries.html
index c8e94ed..d989235 100644
--- a/templates/cmp/search-countries.html
+++ b/templates/cmp/search-countries.html
@@ -3,7 +3,8 @@
 {% block title %}Countries{% endblock %}
 {% block content %}
 
-<h1>Search Countries</h1>
+<div class="center-content">
+<h3>Search Countries</h3>
 
 <div name="search-input" class="search-input">
 <form method="get">
@@ -12,13 +13,25 @@ <h1>Search Countries</h1>
 </form>
 </div>
 
+<div>
+  <table class="content-table">
+    <thead class="">
+      <tr>
+        <th></th>
+        <th>NAME</th>
+        <th>FLAG</th>
+      </tr>
+    </thead>
 
 {% for country in countries %}
-    <p>
-        <a href="{% url 'edit-countries' country.id %}">{{ country.name }}</a>
-    </p>
+    <tr>
+      <td><button class="glossy-button" onclick="location.href='{% url 'edit-countries' country.id %}'" type="button">EDIT</button></td>
+      <td><span class="soldier-info">{{ country.name }}</span></td>
+      <td><span class="soldier-info">{{ country.flag }}</span></td>
+    </tr>
 {% endfor %}
+</table>
+</div>
 
-
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
\ No newline at end of file
diff --git a/templates/cmp/search-decorations.html b/templates/cmp/search-decorations.html
index 47cf8a1..095b543 100644
--- a/templates/cmp/search-decorations.html
+++ b/templates/cmp/search-decorations.html
@@ -3,7 +3,8 @@
 {% block title %}Decorations{% endblock %}
 {% block content %}
 
-<h1>Search Decorations</h1>
+<div class="center-content">
+<h3>Search Decorations</h3>
 
 <div name="search-input" class="search-input">
 <form method="get">
@@ -13,12 +14,23 @@ <h1>Search Decorations</h1>
 </div>
 
 <div>
+  <table class="content-table">
+    <thead class="">
+      <tr>
+        <th></th>
+        <th>NAME</th>
+        <th>COUNTRY</th>
+      </tr>
+    </thead>
+
 {% for decoration in page_obj %}
-<p class="soldier-details">
-  <button class="glossy-button" onclick="location.href='{% url 'edit-decorations' decoration.id %}'" type="button">Edit</button> 
-  <span class="soldier-info">{{ decoration.name}} {{ decoration.country.name }} {{ decoration.country.flag }} </span>
-</p>
+<tr>
+  <td><button class="glossy-button" onclick="location.href='{% url 'edit-decorations' decoration.id %}'" type="button">EDIT</button></td>
+  <td><span class="soldier-info">{{ decoration.name }}</span></td>
+  <td><span class="soldier-info">{{ decoration.country.flag }} {{ decoration.country.name }} </span></td>
+</tr>
 {% endfor %}
+</table>
 </div>
 
 <p>Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}</p>
@@ -27,6 +39,7 @@ <h1>Search Decorations</h1>
     <!-- Display the soldier -->
 {% endfor %}
 
+<span>
 {% if page_obj.has_previous %}
     <a href="?q={{ request.GET.q }}&page={{ page_obj.previous_page_number }}">Previous</a>
 {% endif %}
@@ -34,5 +47,7 @@ <h1>Search Decorations</h1>
 {% if page_obj.has_next %}
     <a href="?q={{ request.GET.q }}&page={{ page_obj.next_page_number }}">Next</a>
 {% endif %}
+</span>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
\ No newline at end of file
diff --git a/templates/cmp/search-prisoner-of-war-camps.html b/templates/cmp/search-prisoner-of-war-camps.html
index 76e534e..2331e27 100644
--- a/templates/cmp/search-prisoner-of-war-camps.html
+++ b/templates/cmp/search-prisoner-of-war-camps.html
@@ -3,19 +3,34 @@
 {% block title %}Countries{% endblock %}
 {% block content %}
 
-<h1>Search Prisoner of War Camps</h1>
+<div class="center-content">
+<h3>Search Prisoner of War Camps</h3>
 
 <div name="search-input" class="search-input">
 <form method="get">
-  <input type="text" name="q" placeholder="Search Prisoner of War Camps to edit">
+  <input type="text" name="q" placeholder="PoW Camp Name">
   <input type="submit" value="Search">
 </form>
 </div>
 
+<div>
+  <table class="content-table">
+    <thead class="">
+      <tr>
+        <th></th>
+        <th>NAME</th>
+        <th>COUNTRY</th>
+      </tr>
+    </thead>
 {% for powcamp in powcamps %}
-    <p>
-        <a href="{% url 'edit-prisoner-of-war-camps' powcamp.id %}">{{ powcamp.name }}</a>
-    </p>
+    <tr>
+      <td><button class="glossy-button" onclick="location.href='{% url 'edit-prisoner-of-war-camps' powcamp.id %}'" type="button">EDIT</button></td>
+      <td><span class="soldier-info">{{ powcamp.name }}</span></td>
+      <td><span class="soldier-info">{{ powcamp.country.flag }} {{ powcamp.country.name }}</span></td>
+    </tr>
+
+
 {% endfor %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
\ No newline at end of file
diff --git a/templates/cmp/search-ranks.html b/templates/cmp/search-ranks.html
index 980fbfd..ac28b60 100644
--- a/templates/cmp/search-ranks.html
+++ b/templates/cmp/search-ranks.html
@@ -3,7 +3,8 @@
 {% block title %}Ranks{% endblock %}
 {% block content %}
 
-<h1>Search Ranks</h1>
+<div class="center-content">
+<h3>Search Ranks</h3>
 
 <div name="search-input" class="search-input">
 <form method="get">
@@ -12,12 +13,21 @@ <h1>Search Ranks</h1>
 </form>
 </div>
 
-{% for rank in ranks%}
-    <p>
-        <a href="{% url 'edit-ranks' rank.id %}">{{ rank.name }}</a>
-    </p>
-{% endfor %}
+   <div>
+     <table class="content-table">
+       <thead class="">
+         <tr>
+           <th></th>
+           <th>NAME</th>
+         </tr>
+       </thead>
+       {% for rank in ranks%}
+       <tr>
+        <td><button class="glossy-button" onclick="location.href='{% url 'edit-ranks' rank.id %}'" type="button">EDIT</button></td>
+        <td><span class="soldier-info">{{ rank.name}}</span></td>
+      </tr>
+       {% endfor %}
+   </div>
 
-
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+</div>
\ No newline at end of file