diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 1190cde85..1d23210b3 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -611,7 +611,7 @@ def week_view(request, num=None):
     return render_to_response(template,
             {"timeslots":timeslots,"render_types":["Session","Other","Break","Plenary"]}, context_instance=RequestContext(request))
 
-@role_required('Secretariat')
+@role_required('Area Director','Secretariat','IAB')
 def room_view(request, num=None):
     meeting = get_meeting(num)
 
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 8f9c4f937..b7d4527ca 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -41,14 +41,21 @@
         <b>Note:</b> IETF agendas are subject to change, up to and during a meeting.
       </p>
 
-      <p class="noprint buttonlist">
+      <p class="noprint ">
         {% if "-utc" in request.path %}
-          <a class="btn btn-default" href="/meeting/agenda">Agenda in local timezone</a>
+          <a href="{% url 'ietf.meeting.views.agenda' num=schedule.meeting.number %}">Agenda in local timezone</a>,
         {% else %}
-          <a class="btn btn-default" href="/meeting/agenda-utc">Agenda in UTC timezone</a>
+          {% comment %}<a href="{% url 'ietf.meeting.views.agenda' base='agenda-utc' %}">Agenda in UTC timezone</a>,{% endcomment %}
+          <a href="/meeting/agenda-utc">Agenda in UTC timezone</a>,
+        {% endif %}
+        <a href="{% url 'ietf.meeting.views.agenda' num=schedule.meeting.number ext='.txt' %}">Plaintext agenda</a>,
+        <a href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/">Tools-style agenda</a>
+        {% if user|has_role:"Secretariat,Area Director,IAB" %}
+          ,
+          <a href="{% url 'ietf.meeting.views.agenda_by_room' num=schedule.meeting.number%}">List by Room</a>,
+          <a href="{% url 'ietf.meeting.views.agenda_by_type' num=schedule.meeting.number%}">List by Type</a>,
+          <a href="{% url 'ietf.meeting.views.room_view' num=schedule.meeting.number%}">Room Grid</a>
         {% endif %}
-        <a class="btn btn-default" href="/meeting/{{schedule.meeting.number}}/agenda.txt">Plaintext agenda</a>
-        <a class="btn btn-default" href="https://tools.ietf.org/agenda/{{schedule.meeting.number}}/">Tools-style agenda</a>
       </p>
 
       {# cache this part for 5 minutes -- it takes 3-6 seconds to generate #}