diff --git a/src/tixlcontrol/static/tixlcontrol/less/forms.less b/src/tixlcontrol/static/tixlcontrol/less/forms.less
index b8a3906b91..a118c671c8 100644
--- a/src/tixlcontrol/static/tixlcontrol/less/forms.less
+++ b/src/tixlcontrol/static/tixlcontrol/less/forms.less
@@ -34,8 +34,7 @@ td > .form-group > .checkbox {
 }
 
 .submit-group {
-    margin: 0 !important;
-    margin-top: 15px;
+    margin: 15px 0 0 0 !important;
     padding: 15px;
     background: #eeeeee;
     text-align: right;
@@ -46,4 +45,8 @@ td > .form-group > .checkbox {
         .pull-left;
         .btn-lg;
     }
+}
+
+.container ul.nav-pills {
+    margin: 20px 0;
 }
\ No newline at end of file
diff --git a/src/tixlcontrol/templates/tixlcontrol/event/base.html b/src/tixlcontrol/templates/tixlcontrol/event/base.html
index dce9aff9a0..95db6fd9b0 100644
--- a/src/tixlcontrol/templates/tixlcontrol/event/base.html
+++ b/src/tixlcontrol/templates/tixlcontrol/event/base.html
@@ -16,6 +16,6 @@
 	</ul>
 </li>
 <li {% if url_name == "event.index" %}class="active"{% endif %}><a href="{% url 'control:event.index' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Dashboard" %}</a></li>
-<li {% if url_name == "event.settings" %}class="active"{% endif %}><a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Settings" %}</a></li>
+<li {% if "event.settings" in url_name %}class="active"{% endif %}><a href="{% url 'control:event.settings' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Settings" %}</a></li>
 <li {% if "event.item" in url_name %}class="active"{% endif %}><a href="{% url 'control:event.items' organizer=request.event.organizer.slug event=request.event.slug %}">{% trans "Items" %}</a></li>
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/index.html b/src/tixlcontrol/templates/tixlcontrol/item/index.html
index 56ab5d95db..4b9d43886a 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/index.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/index.html
@@ -2,8 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% block inside %}
-	<h2>{% trans "General information" %}</h2>
-	
 	{% if "success" in request.GET %}
 		<div class="alert alert-success">
 			{% trans "Your changes have been saved." %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html b/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
index a4d5c3ec73..d2c3bf16ab 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/restrictions.html
@@ -3,7 +3,6 @@
 {% load bootstrap3 %}
 {% load formset_tags %}
 {% block inside %}
-	<h2>{% trans "Restrictions" %}</h2>
 	<form action="" method="post">
 		{% csrf_token %}
 		{% for set in formsets %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html
index f597eab331..489d2051dd 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_0d.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% block inside %}
-	<h2>{% trans "Variations" %}</h2>
 	<em>{% trans "You have to define and select propreties to be able to configure variations." %}
 	
 {% endblock %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
index 8694e8855d..480d42d3db 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_1d.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% block inside %}
-	<h2>{% trans "Variations" %}</h2>
 	<form action="" method="post">
 		{% csrf_token %}
 		<table class="table">
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
index 63b200f7a3..f84f92907f 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_2d.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% block inside %}
-	<h2>{% trans "Variations" %}</h2>
 	<form action="" method="post">
 		{% csrf_token %}
 		<table class="table">
diff --git a/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html b/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
index c960e701ab..3fcfceba1e 100644
--- a/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
+++ b/src/tixlcontrol/templates/tixlcontrol/item/variations_nd.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% block inside %}
-	<h2>{% trans "Variations" %}</h2>
 	<form action="" method="post">
 		{% csrf_token %}
 		{% for major in forms %}
diff --git a/src/tixlcontrol/templates/tixlcontrol/items/property.html b/src/tixlcontrol/templates/tixlcontrol/items/property.html
index 35a69d7737..70db5c7a4f 100644
--- a/src/tixlcontrol/templates/tixlcontrol/items/property.html
+++ b/src/tixlcontrol/templates/tixlcontrol/items/property.html
@@ -24,14 +24,14 @@
 					{% for f in formset %}
 						<div class="form-group" data-formset-form>
 							{{ f.id }}
-							<div class="col-sm-10">
+							<div class="col-sm-9">
 								{% bootstrap_field f.value form_group_class="" layout="inline" %}
 							</div>
 							<div class="sr-only">
 								{% bootstrap_field f.ORDER form_group_class="" layout="inline" %}
 								{% bootstrap_field f.DELETE form_group_class="" layout="inline" %}
 							</div>
-							<div class="col-sm-2 text-right">
+							<div class="col-sm-3 text-right">
 								<button type="button" class="btn btn-default" data-formset-move-up-button><i class="fa fa-arrow-up"></i></button>
 								<button type="button" class="btn btn-default" data-formset-move-down-button><i class="fa fa-arrow-down"></i></button>
 								<button type="button" class="btn btn-danger" data-formset-delete-button><i class="fa fa-trash"></i></button>
@@ -43,14 +43,14 @@
 					{% escapescript %}
 						<div class="form-group" data-formset-form>
 							{{ formset.empty_form.id }}
-							<div class="col-sm-10">
+							<div class="col-sm-9">
 								{% bootstrap_field formset.empty_form.value form_group_class="" layout="inline" %}
 							</div>
 							<div class="sr-only">
 								{% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
 								{% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
 							</div>
-							<div class="col-sm-2 text-right">
+							<div class="col-sm-3 text-right">
 								<button type="button" class="btn btn-default" data-formset-move-up-button><i class="fa fa-arrow-up"></i></button>
 								<button type="button" class="btn btn-default" data-formset-move-down-button><i class="fa fa-arrow-down"></i></button>
 								<button type="button" class="btn btn-danger" data-formset-delete-button><i class="fa fa-trash"></i></button>