diff --git a/qpanel/backend.py b/qpanel/backend.py
index 589e8dd..49adaea 100644
--- a/qpanel/backend.py
+++ b/qpanel/backend.py
@@ -97,8 +97,10 @@ def filter_data_for_user(self, data, user):
             user -- username
         """
         enables = self.config.queue_enables_for_username(user)
-        not_enable = list(set(data.keys()) - set(enables))
-        map(data.pop, not_enable)
+        if len(enables):
+            for q in list(data.keys()):
+                if q not in enables:
+                    data.pop(q)
         return data
 
     def parse_fs(self, data):
diff --git a/qpanel/themes/qpanel/templates/header.html b/qpanel/themes/qpanel/templates/header.html
index 4346809..df8982f 100644
--- a/qpanel/themes/qpanel/templates/header.html
+++ b/qpanel/themes/qpanel/templates/header.html
@@ -38,6 +38,7 @@
                   </p>
                 </a>
               </li>
+              {% endif %}
               {% if has_users() %}
                <li class="nav-item">
                 <a class="nav-link" href="{{url_for('.logout')}}">
@@ -48,7 +49,6 @@
                  </a>
               </li>
               {% endif %}
-              {% endif %}
               <li class="nav-item dropdown">
                 <a class="nav-link" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <i class="material-icons">language</i>
diff --git a/qpanel/themes/qpanel/templates/index.html b/qpanel/themes/qpanel/templates/index.html
index d77d6c2..0c677ed 100644
--- a/qpanel/themes/qpanel/templates/index.html
+++ b/qpanel/themes/qpanel/templates/index.html
@@ -32,7 +32,7 @@
       <div class="content">
         <div class="row">
         {% include theme('row_general_data.html') %}
-        {% for queue_name, queue in queues.items() %}
+        {% for queue_name, queue in queues.items() | sort %}
           <div class="col-md-4">
             <div class="card card-chart">
               <div class="card-header card-header-success queue-card">
diff --git a/qpanel/themes/qpanel/templates/queue.html b/qpanel/themes/qpanel/templates/queue.html
index bc1e1ec..43d3304 100644
--- a/qpanel/themes/qpanel/templates/queue.html
+++ b/qpanel/themes/qpanel/templates/queue.html
@@ -40,7 +40,7 @@
             <div class="card">
               <div class="card-header card-header-primary">
                 <h4 class="card-title">
-                    {{ _('Agents') }}: <span id="total_agent" class="label label-default"></span>
+                    [{{ name }}] {{ _('Agents') }}: <span id="total_agent" class="label label-default"></span>
                 </h4>
               </div>
               <div class="card-body">
@@ -102,7 +102,7 @@ <h4 class="card-title">
             <div class="card">
               <div class="card-header card-header-primary">
                 <h4 class="card-title">
-                    {{ _('Callers') }}: <span id="total_callers" class="label label-default"></span>
+                    [{{ name }}] {{ _('Callers') }}: <span id="total_callers" class="label label-default"></span>
                 </h4>
               </div>
               <div class="card-body">