diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
index c06389d1..acb984c1 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
@@ -12,12 +12,6 @@
   {% endif %}
 {% endblock %}
 
-{% block agenda-extra-management-actions %}
-  {% if has_resources %}<a rel="popup" href="{% url 'chrono-manager-agenda-add-resource' pk=object.pk %}">{% trans 'Add resource' %}</a>{% endif %}
-  <a rel="popup" href="{% url 'chrono-manager-agenda-add-meeting-type' pk=object.id %}">{% trans 'New Meeting Type' %}</a>
-  <a rel="popup" href="{% url 'chrono-manager-agenda-add-desk' pk=object.id %}">{% trans 'New Desk' %}</a>
-{% endblock %}
-
 {% block agenda-extra-menu-actions %}
   {% if object.desk_simple_management %}
     <li><a href="{% url 'chrono-manager-agenda-desk-management-toggle-view' pk=object.pk %}">{% trans 'Switch to invididual desk management' %}</a></li>
@@ -66,11 +60,14 @@
     {% else %}
       <div class="big-msg-info">
         {% blocktrans trimmed %}
-          This agenda doesn't have any meeting type yet. Click on the "New Meeting Type" button in
-          the top right of the page to add a first one.
+          This agenda doesn't have any meeting type yet. Click on the "New Meeting Type" button to add a first one.
         {% endblocktrans %}
       </div>
     {% endif %}
+    <div class="panel--buttons">
+      <a rel="popup" class="button" href="{% url 'chrono-manager-agenda-add-meeting-type' pk=object.id %}">{% trans 'New Meeting Type' %}</a>
+    </div>
+
   </div>
 
   {% if object.desk_simple_management %}
@@ -83,6 +80,9 @@
           </li>
         {% endfor %}
       </ul>
+      <div class="panel--buttons">
+        <a rel="popup" class="button" href="{% url 'chrono-manager-agenda-add-desk' pk=object.id %}">{% trans 'New Desk' %}</a>
+      </div>
     </div>
   {% endif %}
 
@@ -139,11 +139,15 @@
     {% else %}
       <div class="big-msg-info">
         {% blocktrans trimmed %}
-          This agenda doesn't have any desk yet. Click on the "New Desk" button in
-          the top right of the page to add a first one.
+          This agenda doesn't have any desk yet. Click on the "New Desk" button to add a first one.
         {% endblocktrans %}
       </div>
     {% endif %}
+    {% if not object.desk_simple_management %}
+      <div class="panel--buttons">
+        <a rel="popup" class="button" href="{% url 'chrono-manager-agenda-add-desk' pk=object.id %}">{% trans 'New Desk' %}</a>
+      </div>
+    {% endif %}
   </div>
 
   {% if has_resources %}
@@ -164,12 +168,14 @@
         {% else %}
           <div class="big-msg-info">
             {% blocktrans trimmed %}
-              This agenda doesn't have any resource yet. Click on the "Add resource" button in
-              the top right of the page to add a first one.
+              This agenda doesn't have any resource yet. Click on the "Add resource" button to add a first one.
             {% endblocktrans %}
           </div>
         {% endif %}
       {% endwith %}
+      <div class="panel--buttons">
+        <a rel="popup" class="button" href="{% url 'chrono-manager-agenda-add-resource' pk=object.pk %}">{% trans 'Add resource' %}</a>
+      </div>
     </div>
   {% endif %}