diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index 35acde2d64bf5db106cee6300d41100a4a0a8483..68642316b7fcee94f71a5a0d93f9ad6830883b92 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -6,6 +6,7 @@
     {% include "@core/_frontpage_menu.twig" %}
 
     {% if metaentries.hosted is iterable and metaentries.hosted is not empty %}
+    <h2>{% trans %}Hosted entities{% endtrans %}</h2>
     <dl>
     {% for key, set in metaentries.hosted %}
         {% set metadataset = attribute(set, 'metadata-set') %}
@@ -32,6 +33,7 @@
     {% endif %}
 
     {% if metaentries.remote is iterable and metaentries.remote is not empty %}
+    <h2>{% trans %}Trusted entities{% endtrans %}</h2>
     {% for key, set in metaentries.remote %}
     <fieldset class="fancyfieldset">
         <legend>{{ mtype[key]|trans }} (Trusted)</legend>
@@ -64,21 +66,19 @@
     </ul>
 
     {% if isadmin %}
-    <fieldset class="fancyfieldset">
-        <legend>Lookup metadata</legend>
-        <form action="{{ metadata_url }}" method="get">
-            <p>Look up metadata for entity:
-                <select name="set">
-                {% if metaentries.remote is defined and metaentries.remote is not empty %}
-                {% for key, set in metaentries.remote %}
-                    <option value="{{ key|escape('html') }}">{{ mtype[key]|trans }}</option>
-                {% endfor %}
-                {% endif %}
-                </select>
-                <input type="text" name="entityid" />
-                <button class="btn" type="submit">Lookup </button>
-            </p>
-        </form>
+    <form action="{{ metadata_url }}" method="get" class="pure-form">
+        <p>Look up metadata for entity:
+            <select name="set">
+            {% if metaentries.remote is defined and metaentries.remote is not empty %}
+            {% for key, set in metaentries.remote %}
+                <option value="{{ key|escape('html') }}">{{ mtype[key]|trans }}</option>
+            {% endfor %}
+            {% endif %}
+            </select>
+            <input type="text" name="entityid" class="edge">
+            <button class="pure-button pure-button-red" type="submit">Lookup</button>
+        </p>
+    </form>
     </fieldset>
     {% endif %}
 {% endblock %}
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 72e98ea8cd39c3d90fce32d384bda90396470210..3f399e7d8948ea6456f403e00a5a4b710c4b3d93 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -44,6 +44,7 @@ $allLinks = [
 $metadataHosted = [];
 \SimpleSAML\Module::callHooks('metadata_hosted', $metadataHosted);
 
+var_dump($metadataHosted);
 
 $metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();