diff --git a/src/Controller/AuditTomController.php b/src/Controller/AuditTomController.php
index 96a8e3f4..1955127f 100644
--- a/src/Controller/AuditTomController.php
+++ b/src/Controller/AuditTomController.php
@@ -224,7 +224,8 @@ public function editAuditTom(
                 'activ' => $audit->getActiv(),
                 'activNummer' => false,
                 'nextAudit' => $nextAudit,
-                'snack' => $request->get('snack')
+                'snack' => $request->get('snack'),
+                'urlBack' => $this->generateUrl('audit_tom'),
             ]
         );
     }
diff --git a/src/Controller/TomController.php b/src/Controller/TomController.php
index e741e9eb..f45a83b3 100644
--- a/src/Controller/TomController.php
+++ b/src/Controller/TomController.php
@@ -201,7 +201,8 @@ public function editTom(
             'activ' => $tom->getActiv(),
             'activTitel' => false,
             'snack' => $request->get('snack'),
-            'currentTeam' => $team
+            'currentTeam' => $team,
+            'urlBack' => $this->generateUrl('tom'),
         ]);
     }
 
diff --git a/templates/audit_tom/edit.html.twig b/templates/audit_tom/edit.html.twig
index a5be688b..b6ff8a31 100644
--- a/templates/audit_tom/edit.html.twig
+++ b/templates/audit_tom/edit.html.twig
@@ -1,31 +1,25 @@
 {% extends 'base.html.twig' %}
 {% trans_default_domain 'audit_tom' %}
 
+{% block title %}
+    {{ title }} ({% trans from 'general' %}number{% endtrans %}: {{ audit.nummer }})
+{% endblock %}
+
 {% block CTA %}
     {% if audit.activ %}
-        <a href="{{ path('bericht_audit', {'id':audit.id}) }}">
-            <span>{% trans %}pdf.create{% endtrans %}</span>
+        <a href="{{ path('bericht_audit', {'id':audit.id}) }}" class="btn">
+            {% trans %}pdf.create{% endtrans %}
         </a>
-        <a href="{{ path('bericht_audit', {'id':audit.id, 'all':1}) }}">
-            <span>{% trans %}pdf.createWithHistory{% endtrans %}</span>
+        <a href="{{ path('bericht_audit', {'id':audit.id, 'all':1}) }}" class="btn">
+            {% trans %}pdf.createWithHistory{% endtrans %}
         </a>
     {% endif %}
 {% endblock %}
 
 {% block body %}
-    <div>
-        <div>
-            <h2>{{ title }} ({% trans from 'general' %}number{% endtrans %}: {{ audit.nummer }})</h2>
-        </div>
-        <div>
-            {{ include('assign/__assign.html.twig',{'data':audit,'path':'assign_audit'}) }}
-        </div>
-    </div>
-
-    <div>
-        {{ include('audit_tom/__form.html.twig') }}
-    </div>
-    <p>{% trans %}createdBy{% endtrans %}: {{ audit.user.email }}</p>
+    {{ include('assign/__assign.html.twig',{'data':audit,'path':'assign_audit'}) }}
+    {{ include('audit_tom/__form.html.twig') }}
+    <p class="text-muted mt-5 text-sm">{% trans %}createdBy{% endtrans %}: {{ audit.user.email }}</p>
     {% if audit.previous %}
         <div>
             <h2>{% trans %}history{% endtrans %}</h2>
@@ -33,7 +27,4 @@
         </div>
     {% endif %}
     {{ include('base/__snack.html.twig') }}
-{% endblock %}
-
-{% block javascript %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/templates/base/__approveBtn.html.twig b/templates/base/__approveBtn.html.twig
index 994b5548..4d29c3c9 100644
--- a/templates/base/__approveBtn.html.twig
+++ b/templates/base/__approveBtn.html.twig
@@ -3,7 +3,7 @@
 {% if data.team in app.user.adminRoles and not data.activ == 0 %}
     <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
        href='{{ path(dataLink,{'id':data.id}) }}' type='button'
-       class='btn btn-success ml-1 btn-sm'>
+       class='btn btn-create'>
         {% if data.approved %}
             {% trans %}rescindApproval{% endtrans %}
         {% else %}
diff --git a/templates/base/__disableBtn.html.twig b/templates/base/__disableBtn.html.twig
index e09de4c9..c937af9b 100644
--- a/templates/base/__disableBtn.html.twig
+++ b/templates/base/__disableBtn.html.twig
@@ -3,7 +3,7 @@
 {% if data.team in app.user.adminRoles and not data.approved and not data.activ == 0 %}
     <a onClick="return confirm('{% trans %}confirmAction{% endtrans %}')"
        href='{{ path(dataLink,{'id':data.id}) }}' type='button'
-       class='btn btn-danger ml-1 btn-sm'>
+       class='btn btn-danger'>
         {% if data.activ == 1 %}
             {% trans %}delete{% endtrans %}
         {% else %}
diff --git a/templates/tom/edit.html.twig b/templates/tom/edit.html.twig
index 9f57f213..639938b9 100644
--- a/templates/tom/edit.html.twig
+++ b/templates/tom/edit.html.twig
@@ -1,10 +1,14 @@
 {% extends 'base.html.twig' %}
 {% trans_default_domain 'tom' %}
 
+{% block title %}
+    {{ tom.titel }} - {{ title }}
+{% endblock %}
+
 {% block CTA %}
     {% if tom.activ %}
-        <a href="{{ path('bericht_tom', {'id':tom.id}) }}">
-            <span>{% trans from 'general' %}pdf.create{% endtrans %}</span>
+        <a href="{{ path('bericht_tom', {'id':tom.id}) }}" class="btn">
+            {% trans from 'general' %}pdf.create{% endtrans %}
         </a>
         {{ include('base/__approveBtn.html.twig',{'data':tom,'dataLink':'tom_approve'}) }}
         {{ include('base/__disableBtn.html.twig',{'data':tom,'dataLink':'tom_disable'}) }}
@@ -12,14 +16,8 @@
 {% endblock %}
 
 {% block body %}
-
-    <h2>{{ tom.titel }} - {{ title }}</h2>
-    {{ include('base/__approvedBy.html.twig', {'data':tom}) }}
-
-    <div>
-        {{ include('tom/__form.html.twig') }}
-    </div>
-    <p>{% trans from 'general' %}createdBy{% endtrans %}: {{ tom.user.email }}</p>
+    {{ include('tom/__form.html.twig') }}
+    <p class="text-muted mt-5 text-sm">{% trans from 'general' %}createdBy{% endtrans %}: {{ tom.user.email }}</p>
     {% if tom.previous %}
         <div>
             <h2>{% trans from 'general' %}history{% endtrans %}</h2>
@@ -27,7 +25,4 @@
         </div>
     {% endif %}
     {{ include('base/__snack.html.twig') }}
-{% endblock %}
-
-{% block javascript %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file