diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index bf32519b7..c68ef0a86 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -1,6 +1,4 @@
 from datetime import timedelta
-
-from django.http import HttpResponse
 from django.utils.timezone import now
 from django.views.generic import TemplateView
 from django.db.models import Count, Q
@@ -59,15 +57,29 @@ class ServerStatusView(TemplateView):
     template_name = 'pages/server_status.html'
 
     def get_context_data(self, *args, **kwargs):
-        if not self.request.user.is_staff:
-            raise HttpResponse(status=404)
 
         show_child_submissions = self.request.GET.get('show_child_submissions', False)
 
+        # Get all submissions
         qs = Submission.objects.all()
+
+        # If user is not super user then:
+        # filter this user's own submissions
+        # and
+        # submissions running on queue which belongs to this user
+        if not self.request.user.is_superuser:
+            qs = qs.filter(
+                Q(owner=self.request.user) |
+                Q(phase__competition__queue__isnull=False, phase__competition__queue__owner=self.request.user)
+            )
+
+        # filter for fetching last 2 days submissions
         qs = qs.filter(created_when__gte=now() - timedelta(days=2))
+
+        # filter out child submissions i.e. submission has no parent
         if not show_child_submissions:
             qs = qs.filter(parent__isnull=True)
+
         qs = qs.order_by('-created_when')
         qs = qs.select_related('phase__competition', 'owner')
 
diff --git a/src/static/riot/queues/management.tag b/src/static/riot/queues/management.tag
index fafb43ede..be74a5132 100644
--- a/src/static/riot/queues/management.tag
+++ b/src/static/riot/queues/management.tag
@@ -89,6 +89,11 @@
         </tfoot>
     </table>
 
+    <!--  Server status page button  -->
+    <a href="/server_status" target="_blank">
+        <div class="ui blue right floated button">Open Server status page</div>
+    </a>
+
     <div class="ui modal" ref="modal">
         <div class="header">
             Queue Form
diff --git a/src/templates/base.html b/src/templates/base.html
index e6530429f..565f51943 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -123,10 +123,11 @@
                             </div>
                             <i class="dropdown icon"></i>
                             <div class="menu">
-                                {% if request.user.is_staff %}
+                                
                                     <div class="header">Admin management</div>
 {#                                    <a class="item" href="#">Customize Codalab</a>#}
                                     <a class="item" href="{% url "pages:server_status" %}">Server Status</a>
+                                {% if request.user.is_staff %}
                                     <a class="item" href="{% url "admin:index" %}">Django Admin</a>
                                     <a class="item" href="{% url "su_login" %}">Change User</a>
                                     <a class="item" href="{% url "analytics:analytics" %}">Analytics</a>
diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index a6dbc741f..561353b21 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -31,8 +31,8 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             </thead>
             <tbody>
                 {% if not submissions %}
-                <tr>
-                    <td colspan="5"><i>No submissions, yet!</i></td>
+                <tr class="center aligned">
+                    <td colspan="100%"><em>No submissions, yet!</em></td>
                 </tr>
                 {% endif %}
                 {% for submission in submissions %}
@@ -53,6 +53,8 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             </tbody>
         </table>
 
+
+        {% if user.is_superuser %}
         <h1>Monitor queues</h1>
         <div id="external_monitors" class="ui two column grid">
             <div class="column">
@@ -90,6 +92,7 @@ <h1>Monitor queues</h1>
                 </div>
             </div>
         </div>
+        {% endif %}
     </div>
 
     <script>