diff --git a/schoolapps/fibu/forms.py b/schoolapps/fibu/forms.py
index 99ea64ca652601fb0f3b439739fa5b9a327fdc70..368b5e6f23799ed5ba7cf2fa737c271ebadbb96e 100644
--- a/schoolapps/fibu/forms.py
+++ b/schoolapps/fibu/forms.py
@@ -46,8 +46,10 @@ class BookBookingForm(forms.ModelForm):
     upload = forms.FileField(label='Scan der Rechnung', required=False)
     status = forms.ChoiceField(choices=status_choices, label='Status')
 
-    layout = Layout(Row('description', 'justification', 'contact'),
-                    Row('account', 'status', 'planned_amount'),
+    layout = Layout(Fieldset("Allgemeines",
+                             Row('description', 'justification', 'contact'),
+                             Row('account', 'status', 'planned_amount')
+                             ),
                     Fieldset('Details',
                              Row('firma', 'invoice_number', 'amount'),
                              Row('invoice_date', 'maturity', 'submission_date', 'booking_date'),
diff --git a/schoolapps/fibu/templates/fibu/booking/book.html b/schoolapps/fibu/templates/fibu/booking/book.html
index 00767f74cc42e134842aa160db5e58902dbffdbc..898e3584a9961ee899d7b5945e50e9d6fe472462 100644
--- a/schoolapps/fibu/templates/fibu/booking/book.html
+++ b/schoolapps/fibu/templates/fibu/booking/book.html
@@ -2,24 +2,22 @@
 {% load material_form %}
 
 <main>
+    <h4>Buchung bearbeiten</h4>
 
-   <h4>Buchung bearbeiten</h4>
-
-    <form method="POST"  style="background: #eee">
+    <form method="POST">
         {% csrf_token %}
         {% form form=form %}
         {% endform %}
+
         <span class="right">
             <button type="submit" class="waves-effect waves-light btn green">
-                <i class="material-icons left">send</i> Änderungen übernehmen
+                <i class="material-icons left">save</i> Änderungen übernehmen
             </button>
-            <a href="{% url 'booking' 0 %}">
-            <button type="button" class="waves-effect waves-light btn grey">
+            <a href="{% url 'booking' %}" class="waves-effect waves-light btn red">
                 <i class="material-icons left">cancel</i> Abbrechen
-            </button>
             </a>
         </span>
     </form>
-
 </main>
+
 {% include 'partials/footer.html' %}
diff --git a/schoolapps/fibu/templates/fibu/booking/new.html b/schoolapps/fibu/templates/fibu/booking/new.html
index 3409f572eb8c562581dfe41f2704a72ed144d0c4..ae676269c72a44ee544fdaa1972178ef3cdf2bd1 100644
--- a/schoolapps/fibu/templates/fibu/booking/new.html
+++ b/schoolapps/fibu/templates/fibu/booking/new.html
@@ -3,20 +3,19 @@
 
 <main>
 
-   <h4>Neue Buchung</h4>
+    <h4>Neue Buchung</h4>
 
-    <form method="POST"  style="background: #eee">
+    <form method="POST">
         {% csrf_token %}
         {% form form=form %}
         {% endform %}
+
         <span class="right">
             <button type="submit" class="waves-effect waves-light btn green">
-                <i class="material-icons left">send</i> Buchung anlegen
+                <i class="material-icons left">save</i> Buchung anlegen
             </button>
-            <a href="{% url 'booking' %}">
-            <button type="button" class="waves-effect waves-light btn grey">
+            <a href="{% url 'booking' %}" class="waves-effect waves-light btn red">
                 <i class="material-icons left">cancel</i> Abbrechen
-            </button>
             </a>
         </span>
     </form>
diff --git a/schoolapps/fibu/views.py b/schoolapps/fibu/views.py
index a83204d40b78878616095d5d9d2748532518bb9a..f2780332783e6980c09da6c4a724afa62431c69b 100644
--- a/schoolapps/fibu/views.py
+++ b/schoolapps/fibu/views.py
@@ -120,7 +120,7 @@ def book(request, id):
         form = BookBookingForm(request.POST, request.FILES, instance=booking)
         if form.is_valid():
             form.save()
-
+            messages.success(request, "Die Änderungen an der Buchung wurden erfolgreich übernommen.")
             return redirect(reverse('booking'))
     context = {'form': form}
     return render(request, template, context)
@@ -135,6 +135,7 @@ def new_booking(request):
         form = BookBookingForm(request.POST, request.FILES)
         if form.is_valid():
             form.save()
+            messages.success(request, "Die Buchung wurde erfolgreich angelegt.")
 
             return redirect(reverse('booking'))
     context = {'form': form}
diff --git a/schoolapps/templates/partials/header.html b/schoolapps/templates/partials/header.html
index d8c750b82a3b07c7c1bcece3604973c2f8454297..65907593381a13e89ce78e0815865eb1da657818 100755
--- a/schoolapps/templates/partials/header.html
+++ b/schoolapps/templates/partials/header.html
@@ -201,7 +201,7 @@
                                 </li>
                             {% endif %}
                             {% if perms.fibu.manage_booking %}
-                                <li class="url-booking">
+                                <li class="url-booking url-booking_book url-new_booking">
                                     <a href="{% url 'booking' 0 %}"><i class="material-icons">receipt</i>Buchungen
                                     </a>
                                 </li>