diff --git a/apis_core/apis_metainfo/templates/generic_list.html b/apis_core/apis_metainfo/templates/generic_list.html
index 1bf12b122..9dbe5f489 100644
--- a/apis_core/apis_metainfo/templates/generic_list.html
+++ b/apis_core/apis_metainfo/templates/generic_list.html
@@ -53,13 +53,6 @@ <h3 style="margin-bottom:15px;">
             <!--Search mask-->
             {% load django_tables2 crispy_forms_tags %}
             <form action="." class="uniForm" method="get">
-
-              {% if togglable_colums %}
-                <legend>Select additional columns</legend>
-                {% column_selector %}
-              {% endif %}
-
-              <br />
               {% crispy filter.form filter.form.helper %}
             </form>
 
@@ -118,6 +111,7 @@ <h1>{{ data.title }}</h1>
               {% endif %}
 
             {% endblock %}
+
           </div>
         </div>
       </div>
@@ -125,7 +119,21 @@ <h1>{{ data.title }}</h1>
         <div class="card">
           <div class="card-body">
             {% with table.paginator.count as total %}
-              <legend>Result: {{ total }} items</legend>
+              <div class="row">
+                <div class="col">
+                  <h3>Result: {{ total }} items</h3>
+                </div>
+                <div class="col">
+
+                  {% if togglable_colums %}
+                    <form method="get" class="form-inline float-right">
+                      {% column_selector %}
+                      <button type="submit" class="form-control">Show</button>
+                    </form>
+                  {% endif %}
+
+                </div>
+              </div>
 
               {% if conf_items %}
                 <div class="dropdown">