diff --git a/app/templates/campaigns/detail.html b/app/templates/campaigns/detail.html
index 5f687a9..fe031d7 100644
--- a/app/templates/campaigns/detail.html
+++ b/app/templates/campaigns/detail.html
@@ -45,15 +45,21 @@ <h3 class="mb-0">{% trans "Rooms" %}</h3>
                         <span class="badge badge-custom-green">CO₂ 584ppm</span>
                         <span class="badge badge-custom-green">TVOC 18ppb</span>
                     </td>
-                    <td class="text-end">
-                        <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                          <a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">
-                            <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
-                        <a href="{% url 'room-update' campaign.pk room.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
-                            </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
-                        <a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
-                            </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
-                        </div>
+                    <td>
+                      <div class="d-flex flex-column flex-md-row gap-2 justify-content-end">
+                        <a href="{% url 'room-detail' room.pk %}" class="btn btn-primary btn-sm">
+                            <i class="bi bi-eye"></i>
+                            <span class="d-none d-sm-inline">{% trans "Details" %}</span>
+                        </a>
+                        <a href="{% url 'room-update' campaign.pk room.pk %}" class="btn btn-secondary btn-sm">
+                            <i class="bi bi-pencil-square"></i>
+                            <span class="d-none d-sm-inline">{% trans "Edit" %}</span>
+                        </a>
+                        <a href="{% url 'room-delete' room.pk %}" class="btn btn-danger btn-sm">
+                            <i class="bi bi-trash"></i>
+                            <span class="d-none d-sm-inline">{% trans "Delete" %}</span>
+                        </a>
+                    </div>
                     </td>
                 </tr>
             {% empty %}
@@ -87,13 +93,17 @@ <h3 class="mb-0">{% trans "Participants" %}</h3>
                 <tr>
                     <td><a href="">{{ user.username }}</a></td>
                     <td>{{ user.email }}</td>
-                    <td class="text-end">
-                        <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                          <a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">
-                            <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
-                          <a href="" class="btn btn-danger btn-sm"><i class="bi bi-x-octagon">
-                            </i> <span class="d-none d-sm-inline">{% trans "Remove" %}</span></a>
-                        </div>
+                    <td>
+                      <div class="text-end d-flex flex-column flex-md-row gap-2 justify-content-end">
+                        <a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">
+                            <i class="bi bi-eye"></i>
+                            <span class="d-none d-sm-inline">{% trans "Details" %}</span>
+                        </a>
+                        <a href="" class="btn btn-danger btn-sm">
+                            <i class="bi bi-x-octagon"></i>
+                            <span class="d-none d-sm-inline">{% trans "Remove" %}</span>
+                        </a>
+                    </div>
                     </td>
                 </tr>
             {% empty %}
diff --git a/app/templates/campaigns/my.html b/app/templates/campaigns/my.html
index 46e60b0..217177b 100644
--- a/app/templates/campaigns/my.html
+++ b/app/templates/campaigns/my.html
@@ -28,15 +28,19 @@ <h5 class="mb-1">
                         <strong>{% trans "Public:" %}</strong> {{ campaign.public|yesno:"Ja,Nein" }}
                     </p>
                 </div>
-                <div>
-                    <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                        <a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">
-                            <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
-                        <a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
-                            </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
-                        <a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
-                            </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
-                    </div>
+                <div class="d-flex flex-column flex-md-row gap-2 justify-content-end">
+                    <a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-primary btn-sm">
+                        <i class="bi bi-eye"></i> 
+                        <span class="d-none d-sm-inline">{% trans "Details" %}</span>
+                    </a>
+                    <a href="{% url 'campaigns-update' campaign.pk %}" class="btn btn-secondary btn-sm">
+                        <i class="bi bi-pencil-square"></i> 
+                        <span class="d-none d-sm-inline">{% trans "Edit" %}</span>
+                    </a>
+                    <a href="{% url 'campaigns-delete' campaign.pk %}" class="btn btn-danger btn-sm">
+                        <i class="bi bi-trash"></i> 
+                        <span class="d-none d-sm-inline">{% trans "Delete" %}</span>
+                    </a>
                 </div>
             </div>
         {% endfor %}
diff --git a/app/templates/organizations/detail.html b/app/templates/organizations/detail.html
index 50bbe84..8ff181c 100644
--- a/app/templates/organizations/detail.html
+++ b/app/templates/organizations/detail.html
@@ -90,7 +90,7 @@ <h4 class="mb-0">{% trans "Invite a User" %}</h4>
     {% endif %}
 
     <!-- Back Button -->
-    <div class="d-flex">
+    <div class="d-flex mb-4">
         <a href="{% url 'organizations-my' %}" class="btn btn-outline-secondary">
             <i class="bi bi-arrow-left"></i> {% trans "Back to Organizations" %}
         </a>
diff --git a/app/templates/organizations/my.html b/app/templates/organizations/my.html
index 6a9180c..3c75eaa 100644
--- a/app/templates/organizations/my.html
+++ b/app/templates/organizations/my.html
@@ -8,45 +8,46 @@
 {% endblock styles %}
 
 {% block content %}
-<div class="d-flex justify-content-between align-items-center mb-4 mt-5">
-    <h2>{% trans "My Organisations" %}</h2>
-    <a href="{% url 'organizations-create' %}" class="btn btn-outline-primary">{% trans "Create Organization" %}</a>
-</div>
-{% if member_organizations %}
-<div class="list-group">
-    {% for organization in organizations %}
-        <div class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-between align-items-start">
-            <div class="mb-2 mb-md-0">
-                <h5 class="mb-1">
-                    <a href="{% url 'organizations-detail' organization.pk %}">{{ organization.name }}</a> 
-                    {% if organization in owner_organizations %}
-                        <span class="badge bg-secondary">{% trans "Owner" %}</span>
-                    {% elif organization in member_organizations %}
-                        <span class="badge bg-secondary">{% trans "Member" %}</span>
-                    {% else %}
-                        <span class="badge bg-secondary">{% trans "Other" %}</span>
-                    {% endif %}
-                </h5>
-                <p class="mb-1">
-                    {{ organization.description|truncatewords:20 }}
-                </p>
-            </div>
-            <div class="d-flex flex-column flex-md-row">
-                <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
+    <div class="d-flex justify-content-between align-items-center mb-4 mt-5">
+        <h2>{% trans "My Organisations" %}</h2>
+        <a href="{% url 'organizations-create' %}" class="btn btn-outline-primary">{% trans "Create Organization" %}</a>
+    </div>
+    {% if member_organizations %}
+    <div class="list-group">
+        {% for organization in organizations %}
+            <div class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-between align-items-start">
+                <div class="mb-2 mb-md-0">
+                    <h5 class="mb-1">
+                        <a href="{% url 'organizations-detail' organization.pk %}">{{ organization.name }}</a> 
+                        {% if organization in owner_organizations %}
+                            <span class="badge bg-secondary">{% trans "Owner" %}</span>
+                        {% elif organization in member_organizations %}
+                            <span class="badge bg-secondary">{% trans "Member" %}</span>
+                        {% else %}
+                            <span class="badge bg-secondary">{% trans "Other" %}</span>
+                        {% endif %}
+                    </h5>
+                    <p class="mb-1">
+                        {{ organization.description|truncatewords:20 }}
+                    </p>
+                </div>
+                <div class="d-flex flex-column flex-md-row gap-2">
                     <a href="{% url 'organizations-detail' organization.pk %}" class="btn btn-primary btn-sm">
-                        <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
-                    <a href="{% url 'organizations-update' organization.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
-                        </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
-                    <a href="{% url 'organizations-delete' organization.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
-                        </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
+                        <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span>
+                    </a>
+                    <a href="{% url 'organizations-update' organization.pk %}" class="btn btn-secondary btn-sm">
+                        <i class="bi bi-pencil-square"></i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span>
+                    </a>
+                    <a href="{% url 'organizations-delete' organization.pk %}" class="btn btn-danger btn-sm">
+                        <i class="bi bi-trash"></i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span>
+                    </a>
                 </div>
             </div>
-        </div>
-    {% endfor %}
-</div>
-{% else %}
-<div class="alert alert-warning" role="alert">
-    {% trans "You are not a member of any organizations." %}
-</div>
-{% endif %}
+        {% endfor %}
+    </div>
+    {% else %}
+    <div class="alert alert-warning" role="alert">
+        {% trans "You are not a member of any organizations." %}
+    </div>
+    {% endif %}
 {% endblock content %}
diff --git a/app/templates/workshops/form.html b/app/templates/workshops/form.html
index bf5e99e..0ee041d 100644
--- a/app/templates/workshops/form.html
+++ b/app/templates/workshops/form.html
@@ -7,7 +7,7 @@
 {% endblock styles %}
 
 {% block content %}
-<h2>{% trans "Workshop" %}</h2>
+<h2 class="mb-4 mt-5">{% trans "Workshop" %}</h2>
 <form method="post">
     {% csrf_token %}
     {{ form|crispy }}
diff --git a/app/templates/workshops/my.html b/app/templates/workshops/my.html
index 8d56be0..2a4c539 100644
--- a/app/templates/workshops/my.html
+++ b/app/templates/workshops/my.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="d-flex justify-content-between align-items-center mb-4 mt-5">
     <h2>{% trans "My Workshops" %}</h2>
-    <a href="{% url 'workshop-create' %}" class="btn btn-outline-primary mt-3">{% trans "Create workshop" %}</a>
+    <a href="{% url 'workshop-create' %}" class="btn btn-outline-primary">{% trans "Create workshop" %}</a>
 </div>
 {% if workshops %}
 <div class="list-group">
@@ -19,15 +19,19 @@ <h5 class="mb-1"><a href="{% url 'workshop-detail' workshop.pk %}">{{ workshop.t
                     <strong>{% trans "Public:" %}</strong> {{ workshop.public|yesno:"Ja,Nein" }}
                 </p>
             </div>
-            <div>
-                <div class="btn-group" role="group" aria-label="{% trans 'Actions' %}">
-                    <a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">
-                        <i class="bi bi-eye"></i> <span class="d-none d-sm-inline">{% trans "Details" %}</span></a>
-                    <a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm"><i class="bi bi-pencil-square">
-                        </i> <span class="d-none d-sm-inline">{% trans "Edit" %}</span></a>
-                    <a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm"><i class="bi bi-trash">
-                        </i> <span class="d-none d-sm-inline">{% trans "Delete" %}</span></a>
-                </div>
+            <div class="d-flex flex-column flex-md-row gap-2 justify-content-end">
+                <a href="{% url 'workshop-detail' workshop.pk %}" class="btn btn-primary btn-sm">
+                    <i class="bi bi-eye"></i>
+                    <span class="d-none d-sm-inline">{% trans "Details" %}</span>
+                </a>
+                <a href="{% url 'workshop-update' workshop.pk %}" class="btn btn-secondary btn-sm">
+                    <i class="bi bi-pencil-square"></i>
+                    <span class="d-none d-sm-inline">{% trans "Edit" %}</span>
+                </a>
+                <a href="{% url 'workshop-delete' workshop.pk %}" class="btn btn-danger btn-sm">
+                    <i class="bi bi-trash"></i>
+                    <span class="d-none d-sm-inline">{% trans "Delete" %}</span>
+                </a>
             </div>
         </div>
     {% endfor %}