diff --git a/dav_events/templates/dav_events/event_detail.html b/dav_events/templates/dav_events/event_detail.html
index f40864d..e5d85e6 100644
--- a/dav_events/templates/dav_events/event_detail.html
+++ b/dav_events/templates/dav_events/event_detail.html
@@ -27,6 +27,15 @@
 
 {% block page-container-fluid %}
 <div class="action-tabs">
+    <div class="pull-right">
+        <a class="btn {% if has_permission_accept %}btn-success{% else %}btn-default disabled{% endif %}"
+           data-toggle="modal" data-target="#modal-accept-dialog">{% trans 'Freigeben' %}</a>
+        <!--
+        <a class="btn btn-warning"
+           href="{% url 'dav_events:event_detail' event.pk %}"
+           title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
+        -->
+    </div>
     <ul class="nav nav-tabs" role="tablist">
         <li>
             <a class="btn"
@@ -36,24 +45,13 @@
             <a class="btn"
                href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a>
         </li>
-        <li class="{% if not has_permission_accept %}disabled{% endif %}">
-            <a class="btn {% if has_permission_accept %}btn-success{% else %}disabled{% endif %}"
-               data-toggle="modal" data-target="#modal-accept-dialog">{% trans 'Freigeben' %}</a>
-        </li>
         <li class="{% if not has_permission_update %}disabled{% endif %}">
             <a class="btn {% if has_permission_update %}btn-warning{% else %}disabled{% endif %}"
                href="{% url 'dav_events:event_update' event.pk %}">{% trans 'Ändern' %}</a>
         </li>
-        <li class="disabled">
-            <a class="btn disabled"
-               href="{% url 'dav_events:event_detail' event.pk %}"
-               title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
-        </li>
     </ul>
 </div>
-{% endblock page-container-fluid %}
 
-{% block page-container %}
 <div class="row">
     <div class="col-sm-12">
         {{ event.render_as_html }}
@@ -96,4 +94,4 @@
         </div>
     </div>
 </div>
-{% endblock page-container %}
\ No newline at end of file
+{% endblock page-container-fluid %}
\ No newline at end of file
diff --git a/dav_events/templates/dav_events/event_list.html b/dav_events/templates/dav_events/event_list.html
index 9301eaa..7c43592 100644
--- a/dav_events/templates/dav_events/event_list.html
+++ b/dav_events/templates/dav_events/event_list.html
@@ -3,13 +3,14 @@
 
 {% block page-container-fluid %}
 <div class="action-tabs">
+    <div class="pull-right">
+        <a class="btn btn-primary"
+           href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a>
+    </div>
     <ul class="nav nav-tabs" role="tablist">
         <li class="active">
             <a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a>
         </li>
-        <li>
-            <a class="btn-primary" href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung' %}</a>
-        </li>
         <li class="{% if not has_permission_export %}disabled{% endif %}">
             <a class="btn {% if not has_permission_export %}disabled{% endif %}"
                href="{% url 'dav_events:event_list_export' %}">{% trans 'Veranstaltungsliste herunterladen' %}</a>
diff --git a/dav_events/templates/dav_events/event_list_export_form.html b/dav_events/templates/dav_events/event_list_export_form.html
index 0887ca1..2729727 100644
--- a/dav_events/templates/dav_events/event_list_export_form.html
+++ b/dav_events/templates/dav_events/event_list_export_form.html
@@ -4,13 +4,14 @@
 
 {% block page-container-fluid %}
 <div class="action-tabs">
+    <div class="pull-right">
+        <a class="btn btn-primary"
+           href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung anlegen' %}</a>
+    </div>
     <ul class="nav nav-tabs" role="tablist">
         <li>
             <a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a>
         </li>
-        <li>
-            <a class="btn-primary" href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung' %}</a>
-        </li>
         <li class="active">
             <a href="{% url 'dav_events:event_list_export' %}">{% trans 'Veranstaltungsliste herunterladen' %}</a>
         </li>
diff --git a/dav_events/templates/dav_events/event_update_form.html b/dav_events/templates/dav_events/event_update_form.html
index 17ed64b..3fa18b1 100644
--- a/dav_events/templates/dav_events/event_update_form.html
+++ b/dav_events/templates/dav_events/event_update_form.html
@@ -13,17 +13,9 @@
         <li>
             <a href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a>
         </li>
-        <li class="{% if not has_permission_accept or event.accepted %}disabled{% endif %}">
-            <a class="{% if has_permission_accept and not event.accepted %}btn-success{% endif %}"
-               href="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Freigeben' %}</a>
-        </li>
         <li class="active">
             <a href="{% url 'dav_events:event_update' event.pk %}">{% trans 'Ändern' %}</a>
         </li>
-        <li class="disabled">
-            <a href="{% url 'dav_events:event_detail' event.pk %}"
-               title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
-        </li>
     </ul>
 </div>
 <form action="" method="post">