diff --git a/templates/base.html.twig b/templates/base.html.twig
index c292a7b..acdc90c 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -23,7 +23,7 @@
             
         </div>
         <div class="col-12 col-md-5 col-lg-8 d-flex align-items-center justify-content-md-end mt-3 mt-md-0">
-        {% if 'ROLE_ADMIN' in app.user.getroles()  %}
+        {% if app.user.getroles is defined and 'ROLE_ADMIN' in app.user.getroles() %}
         <a href="{{ path('app_checkmailnow') }}" class="btn btn-sm btn-primary mx-4">Check mailbox now</a>
         {% endif %}
           {% if app.user.email is defined %}
diff --git a/templates/dashboard/index.html.twig b/templates/dashboard/index.html.twig
index 7a23dc8..10d36e9 100644
--- a/templates/dashboard/index.html.twig
+++ b/templates/dashboard/index.html.twig
@@ -8,44 +8,6 @@
 {% endblock %}
 
 {% block body %}
-                {# <div class="row my-4">
-                    <div class="col-12 col-md-6 col-lg-3 mb-4 mb-lg-0">
-                        <div class="card">
-                            <h5 class="card-header">Reports</h5>
-                            <div class="card-body">
-                              <h5 class="card-title">345k</h5>
-                              <p class="card-text"></p>
-                            </div>
-                          </div>
-                    </div>
-                    <div class="col-12 col-md-6 mb-4 mb-lg-0 col-lg-3">
-                        <div class="card">
-                            <h5 class="card-header">E-Mails reported</h5>
-                            <div class="card-body">
-                              <h5 class="card-title">$2.4k</h5>
-                              <p class="card-text"></p>
-                            </div>
-                          </div>
-                    </div>
-                    <div class="col-12 col-md-6 mb-4 mb-lg-0 col-lg-3">
-                        <div class="card">
-                            <h5 class="card-header">SPF Results</h5>
-                            <div class="card-body">
-                              <h5 class="card-title">43</h5>
-                              <p class="card-text"></p>
-                            </div>
-                          </div>
-                    </div>
-                    <div class="col-12 col-md-6 mb-4 mb-lg-0 col-lg-3">
-                        <div class="card">
-                            <h5 class="card-header">DKIM Results</h5>
-                            <div class="card-body">
-                              <h5 class="card-title">64k</h5>
-                              <p class="card-text"></p>
-                            </div>
-                        </div>
-                    </div>
-                </div> #}
                 <div class="row">
                     <div class="col-12 col-xl-6 mb-4 mb-lg-4">
                         <div class="card">
diff --git a/templates/domains/index.html.twig b/templates/domains/index.html.twig
index 35996ac..566f070 100644
--- a/templates/domains/index.html.twig
+++ b/templates/domains/index.html.twig
@@ -14,6 +14,7 @@
                                           <tr>
                                             <th scope="col">Id</th>
                                             <th scope="col">Domain FQDN</th>
+                                            <th scope="col">MX Records</th>
                                             <th scope="col">Total DMARC reports</th>
                                             <th scope="col">Total SMTP-TLS policies</th>
                                           </tr>
@@ -23,6 +24,11 @@
                                           <tr>
                                             <th scope="row">{{ domain.id }}</th>
                                             <td>{{ domain.fqdn }}</td>
+                                            <td>
+                                              {% for mx in domain.mxrecords %}
+                                                {{ mx.name }}<br>
+                                              {% endfor %}
+                                            </td>
                                             <td>{{ domain.dmarc_reports|length }}</td>
                                             <td>{{ domain.smtptls_policies|length }}</td>
                                           </tr>