diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 654bf275f..204f76974 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -1352,7 +1352,7 @@ VALID_SLIDE_EXTENSIONS = ('.doc','.docx','.pdf','.ppt','.pptx','.txt') # Note th
 class UploadSlidesForm(forms.Form):
     title = forms.CharField(max_length=255)
     file = forms.FileField(label='Slides file to upload.')
-    apply_to_all = forms.BooleanField(label='Apply to all group sessions at this meeting',initial=True,required=False)
+    apply_to_all = forms.BooleanField(label='Apply to all group sessions at this meeting',initial=False,required=False)
 
     def __init__(self, num_sessions, *args, **kwargs):
         super(UploadSlidesForm, self).__init__(*args, **kwargs)
diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py
index 184c01846..27108661e 100644
--- a/ietf/secr/proceedings/views.py
+++ b/ietf/secr/proceedings/views.py
@@ -391,12 +391,14 @@ def recording_edit(request, meeting_num, name):
     )
     
 # TODO - should probably rename this since it's not selecting groups anymore
-@role_required('Secretariat')
 def select(request, meeting_num):
     '''
         Provide the secretariat only functions related to meeting materials management
     '''
 
+    if not has_role(request.user,'Secretariat'):
+        return HttpResponseRedirect(reverse('ietf.meeting.views.materials', kwargs={'num':meeting_num}))
+
     meeting = get_object_or_404(Meeting, number=meeting_num)
     proceedings_url = get_proceedings_url(meeting)
 
diff --git a/ietf/secr/templates/includes/upload_footer.html b/ietf/secr/templates/includes/upload_footer.html
index dfd49ed43..eff80b591 100755
--- a/ietf/secr/templates/includes/upload_footer.html
+++ b/ietf/secr/templates/includes/upload_footer.html
@@ -1,3 +1,5 @@
     <li><a href="https://www.ietf.org/instructions/meeting_materials_tool.html" target="_blank">Instructions</a>.</li>
     <li>If you require assistance in using this tool, or wish to report a bug, then please send a message to <a href="mailto:ietf-action@ietf.org">ietf-action@ietf.org</a>.</li>
     <li>To submit your materials via email, please send agendas to <a href="mailto:agenda@ietf.org">agenda@ietf.org</a> and minutes/presentation slides to <a href="mailto:proceedings@ietf.org">proceedings@ietf.org</a>.</li>
+    <li><bold>Note:</bold> Normal session materials materials management is now performed using the {% if meeting.number %}<a href="{% url 'ietf.meeting.views.materials' num=meeting.number %}">{% endif %}materials page{% if meeting.number %}</a>{% endif %}
+
diff --git a/ietf/templates/group/meetings-row.html b/ietf/templates/group/meetings-row.html
index 042faeb43..1da9b420a 100644
--- a/ietf/templates/group/meetings-row.html
+++ b/ietf/templates/group/meetings-row.html
@@ -15,9 +15,7 @@
          <td>
 	   {% ifchanged s.meeting %}
 	     {% if s.meeting.type.slug == 'ietf' %}
-	       <a href="{% url 'ietf.meeting.views.agenda' num=s.meeting.number %}">
-	       IETF {{s.meeting.number}}
-	       </a>
+	       IETF {{s.meeting.number}} 
 	     {% else %}
 	       {{s.meeting.number}}
 	     {% endif %}
diff --git a/ietf/templates/meeting/edit_materials_button.html b/ietf/templates/meeting/edit_materials_button.html
index 07e1c494a..f65338b7b 100644
--- a/ietf/templates/meeting/edit_materials_button.html
+++ b/ietf/templates/meeting/edit_materials_button.html
@@ -1,4 +1,6 @@
 {% load ietf_filters session_filters %}
 {% if user|has_role:"Secretariat" or session|can_manage_materials:user and not session.is_material_submission_cutoff %}
-<a class="button btn-default btn-sm" href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}#session_{{session.pk}}">Edit</a>
+{% with gt=session.group.type_id %}
+<a class="button btn-default btn-sm" href="{% url 'ietf.meeting.views.session_details' num=session.meeting.number acronym=session.group.acronym %}{% if gt == 'wg' or gt == 'rg' or gt == 'ag' %}{% else %}#session_{{session.pk}}{% endif %}">Edit</a>
+{% endwith %}
 {% endif %}
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index 6aee1a313..c00f6b24b 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -27,7 +27,9 @@
       {% endif %}
 
       <p>
-        <a class="btn btn-default" href="{% url "proceedings" %}">Meeting materials manager</a>
+        {% if user|has_role:"Secretariat" %}
+          <a class="btn btn-default" href="{% url "proceedings" %}">Secretariat proceedings functions</a>
+        {% endif %}
         <a class="btn btn-default" href="/meeting/{{meeting_num}}/requests">Meeting requests/conflicts</a>
       </p>
 
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index d332b7077..de893fa77 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -15,7 +15,7 @@
   <h1>{{ meeting }} : {{ acronym }}</h1>
 
   {% for session in sessions %}
-    <h2 id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}</h2>
+    <h2 class="anchor-target" id="session_{{session.pk}}">{% if sessions|length > 1 %}Session {{ forloop.counter }} : {% endif %}{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}</h2>
     {% if session.agenda_note %}<h3>{{session.agenda_note}}</h3>{% endif %}
 
     {% if can_manage_materials %}
@@ -32,7 +32,7 @@
     {% endif %}
 
     <div class="panel panel-default">
-      <div class="panel-heading">Artifacts</div>
+      <div class="panel-heading">Agenda, Minutes, and Bluesheets</div>
       <div class="panel-body">
         <table class="table table-condensed table-striped">
           {% for pres in session.filtered_artifacts %}
@@ -106,6 +106,9 @@
           <a class="btn btn-default pull-right" href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number %}">Upload New Slides</a>
         {% endif %}
       </div>
+      {% if can_manage_materials %}
+        <div class="panel-footer small">Drag-and-drop to reorder slides</div>
+      {% endif %}
     </div>
     <div class="panel panel-default">
       <div class="panel-heading">Drafts