diff --git a/re2o/templates/re2o/contact.html b/re2o/templates/re2o/contact.html
index f508932e..bf97c288 100644
--- a/re2o/templates/re2o/contact.html
+++ b/re2o/templates/re2o/contact.html
@@ -39,13 +39,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% for contact in contacts %}
 
 <div class="panel panel-info">
-    <div class="panel-heading"><h4>{{ contact.get_name }}</h4></div>
-    <div class="panel-body">
-        <div class="row">
-        <div class="col-sm-9">{{ contact.commentary}}</div>
-        <div class="col-sm-3"><a href="mailto:{{ contact.address }}">{{ contact.address }}</a></div>
-    </div> 
+    <div class="panel-heading">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-sm-6">
+                    <h4>{{ contact.get_name }}</h4>
+                </div>
+                <div class="col-sm-6 text-right">
+                    <a href="mailto:{{ contact.address }}">{{ contact.address }}</a>
+                </div>
+            </div>
+        </div>
     </div>
+    <div class="panel-body">
+        {{ contact.commentary}}
+    </div> 
 </div>
 
 {% endfor %}
diff --git a/tickets/templates/tickets/contact.html b/tickets/templates/tickets/contact.html
index f6c9561b..203bfca7 100644
--- a/tickets/templates/tickets/contact.html
+++ b/tickets/templates/tickets/contact.html
@@ -1,13 +1,19 @@
 {% load i18n %}
 
 <div class="panel panel-info">
-	<div class="panel-heading"><h4>{% trans "Tickets" %}</h4></div>
+	<div class="panel-heading">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-sm-6">
+                    <h4>{% trans "Tickets" %}</h4>
+                </div>
+                <div class="col-sm-6 text-right">
+                    <a class="btn btn-primary" href="{% url 'tickets:new-ticket' %}"><i class="fa fa-ticket"></i> {% trans "Open a ticket" %}</a>
+                </div>
+            </div>
+        </div>
+    </div>
     <div class="panel-body">
-        <div class="row">
-        <div class="col-sm-9">
         {% blocktrans %}If you are experiencing issues with the services offered by {{asso_name}}, you can open a ticket that will be taken care of. If you want to contact us on any other topic, please choose one address below.{% endblocktrans %}
-		</div>
-        <div class="col-sm-3"><a class="btn btn-primary" href="{% url 'tickets:new-ticket' %}"><i class="fa fa-ticket"></i> {% trans "Open a ticket" %}</a></div>
-    </div> 
     </div>
 </div>