diff --git a/templates/base.html.jinja2 b/templates/base.html.jinja2
index 05b4f4e9fc28a74301b2e12fe8b786df0ae51cc3..b908998be8eb44c8922fd03515ac69c7a618c175 100644
--- a/templates/base.html.jinja2
+++ b/templates/base.html.jinja2
@@ -49,6 +49,10 @@
         {% block summary %}{% endblock %}
       </div>
 
+      <div class="d-flex align-items-baseline justify-content-between">
+        {% block buttons %}{% endblock %}
+      </div>
+
       <div class="d-flex align-items-baseline justify-content-between">
         {% block error %}{% endblock %}
       </div>
diff --git a/templates/index.html.jinja2 b/templates/index.html.jinja2
index 236430c4bd85e3ab48e5e523bad77f0169b82301..47de1ad5043340c09bf4178983337de99a271283 100644
--- a/templates/index.html.jinja2
+++ b/templates/index.html.jinja2
@@ -184,9 +184,11 @@
       </div>
     </div>
   </ul>
+{% endblock %}
 
-  <div>
-    {% if meta.new_pipeline_url -%}
+{% block buttons %}
+  {% if meta.new_pipeline_url -%}
+  <ul class="list-inline mr-auto">
     <a class="btn btn-primary {{'disabled' if not summary.wrong_settings_count }}"
         href="{{- meta.new_pipeline_url -}}&amp;var[TRIGGER_GITLAB_RULEZ]=apply
       ">Run gitlab-rulez</a>
@@ -202,8 +204,8 @@
       &amp;var[TRIGGER_FROM_JOB]={{- meta.current_job_url -}}
       {%- endif -%}
       ">Update security</a>
-    {%- endif %}
-  </div>
+  </ul>
+  {%- endif %}
 {% endblock %}
 
 {% block error %}