diff --git a/sapl/templates/parlamentares/mesadiretora_filter.html b/sapl/templates/parlamentares/mesadiretora_filter.html
index 9da3d275c..90929be4c 100644
--- a/sapl/templates/parlamentares/mesadiretora_filter.html
+++ b/sapl/templates/parlamentares/mesadiretora_filter.html
@@ -10,26 +10,28 @@
 
         <ul class="nav nav-tabs" role="tablist">
           {% for md in object_list %}
-            {% if forloop.first %}
-              <li class="nav-item">
-                <a class="nav-link active" href="#tab-mesa-{{ md.id }}" data-toggle="tab" role="tab">{{ md }}</a>
+            {% if forloop.first and request.GET.mesa == md.id|stringformat:"s" or request.GET.mesa == md.id|stringformat:"s" %}
+              <li class="nav-item" role="presentation">
+                <button class="nav-link active" id="tab-mesa-{{ md.id }}-tab" data-toggle="tab" data-target="#tab-mesa-{{ md.id }}" type="button" role="tab" aria-controls="tab-mesa-{{ md.id }}" aria-selected="true">{{ md }}</button>
               </li>
             {% else %}
-              <li class="nav-item">
-                <a class="nav-link" href="#tab-mesa-{{ md.id }}" data-toggle="tab" role="tab">{{ md }}</a>
+              <li class="nav-item" role="presentation">
+                <button class="nav-link" id="tab-mesa-{{ md.id }}-tab" data-toggle="tab" data-target="#tab-mesa-{{ md.id }}" type="button" role="tab" aria-controls="tab-mesa-{{ md.id }}" aria-selected="false">{{ md }}</button>
               </li>
             {% endif %}
           {% endfor %}
         </ul>
         <div class="tab-content">
           {% for md in object_list %}
-            {% if forloop.first or request.GET.mesadiretora == md.id|stringformat:"s" %}
-              <div class="tab-pane fade show active" id="tab-mesa-{{ md.id }}" role="tabpanel">
+            {% if forloop.first or request.GET.mesa == md.id|stringformat:"s" %}
+              <div class="lista-parlamentares tab-pane fade show active" id="tab-mesa-{{ md.id }}" role="tabpanel" aria-labelledby="tab-mesa-{{ md.id }}-tab">
             {% else %}
-              <div class="tab-pane fade" id="tab-mesa-{{ md.id }}" role="tabpanel">
+              <div class="lista-parlamentares tab-pane fade" id="tab-mesa-{{ md.id }}" role="tabpanel" aria-labelledby="tab-mesa-{{ md.id }}-tab">
             {% endif %}
                 <i class="text-muted p-2 d-inline-block">(De {{md.data_inicio }} a {{ md.data_fim }})</i>
-
+                <a href="{% url 'sapl.parlamentares:mesadiretora_list' %}?legislatura={{md.legislatura.id}}&mesa={{ md.id }}" class="btn btn-sm btn-link float-right mb-2">
+                  <i class="fas fa-external-link-alt"></i>
+                </a>
                 <table class="table table-striped table-hover table-link-ordering m-0 p-0">
                   <thead>
                     <tr>