diff --git a/src/program/templates/program_base.html b/src/program/templates/program_base.html
index 223f8f58..64887332 100644
--- a/src/program/templates/program_base.html
+++ b/src/program/templates/program_base.html
@@ -2,22 +2,30 @@
 
 {% block content %}
 
+{% with url_name=request.resolver_match.url_name proposal_urls="proposal_list,speakerproposal_create,speakerproposal_detail,speakerproposal_update,speakerproposal_submit,speakerproposal_picture,eventproposal_create,eventproposal_detail,eventproposal_update,eventproposal_submit" %}
+
 <div class="row">
   <div class="btn-group btn-group-justified hidden-xs">
-    <a href="{% url 'schedule_index' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "schedule_index" or urlyear %}btn-primary{% else %}btn-default{% endif %}">Schedule</a>
-    <a href="{% url 'event_index' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "event_index" %}btn-primary{% else %}btn-default{% endif %}">Events</a>
-    <a href="{% url 'speaker_index' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "speaker_index" %}btn-primary{% else %}btn-default{% endif %}">Speakers</a>
-    <a href="{% url 'call_for_speakers' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "call_for_speakers" %}btn-primary{% else %}btn-default{% endif %}"><span {% if not camp.call_for_speakers_open %}style="text-decoration: line-through;"{% endif %}>Call for Speakers</span></a>
+    <a href="{% url 'schedule_index' camp_slug=camp.slug %}" class="btn {% if url_name == "schedule_index" or urlyear %}btn-primary{% else %}btn-default{% endif %}">Schedule</a>
+    <a href="{% url 'event_index' camp_slug=camp.slug %}" class="btn {% if url_name == "event_index" %}btn-primary{% else %}btn-default{% endif %}">Events</a>
+    <a href="{% url 'speaker_index' camp_slug=camp.slug %}" class="btn {% if url_name == "speaker_index" %}btn-primary{% else %}btn-default{% endif %}">Speakers</a>
+    {% if request.user.is_authenticated %}
+        <a href="{% url 'proposal_list' camp_slug=camp.slug %}" class="btn {% if url_name in proposal_urls %}btn-primary{% else %}btn-default{% endif %}">Your Proposals</a>
+    {% endif %}
   </div>
   <div class="btn-group-vertical visible-xs">
-    <a href="{% url 'schedule_index' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "schedule_index" or urlyear %}btn-primary{% else %}btn-default{% endif %}">Schedule</a>
-    <a href="{% url 'event_index' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "event_index" %}btn-primary{% else %}btn-default{% endif %}">Events</a>
-    <a href="{% url 'speaker_index' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "speaker_index" %}btn-primary{% else %}btn-default{% endif %}">Speakers</a>
-    <a href="{% url 'call_for_speakers' camp_slug=camp.slug %}" class="btn {% if request.resolver_match.url_name == "call_for_speakers" %}btn-primary{% else %}btn-default{% endif %}"><span {% if not camp.call_for_speakers_open %}style="text-decoration: line-through;"{% endif %}>Call for Speakers</span></a>
+    <a href="{% url 'schedule_index' camp_slug=camp.slug %}" class="btn {% if url_name == "schedule_index" or urlyear %}btn-primary{% else %}btn-default{% endif %}">Schedule</a>
+    <a href="{% url 'event_index' camp_slug=camp.slug %}" class="btn {% if url_name == "event_index" %}btn-primary{% else %}btn-default{% endif %}">Events</a>
+    <a href="{% url 'speaker_index' camp_slug=camp.slug %}" class="btn {% if url_name == "speaker_index" %}btn-primary{% else %}btn-default{% endif %}">Speakers</a>
+    {% if request.user.is_authenticated %}
+        <a href="{% url 'proposal_list' camp_slug=camp.slug %}" class="btn {% if url_name in proposal_urls %}btn-primary{% else %}btn-default{% endif %}">Your Proposals</a>
+    {% endif %}
   </div>
 </div>
 <p>
 {% block program_content %}
 {% endblock program_content %}
 
+{% endwith %}
+
 {% endblock content %}
diff --git a/src/program/templates/schedule_base.html b/src/program/templates/schedule_base.html
index 37476547..81de24cc 100644
--- a/src/program/templates/schedule_base.html
+++ b/src/program/templates/schedule_base.html
@@ -38,11 +38,6 @@
             </div>
         </form>
     </div>
-    {% if request.user.is_authenticated %}
-    <div class="col-sm-4">
-        <a href="{% url 'proposal_list' camp_slug=camp.slug %}" class="btn btn-default pull-right">Manage Proposals</a>
-    </div>
-    {% endif %}
 </div>
 
 <hr />
diff --git a/src/program/templates/speaker_list.html b/src/program/templates/speaker_list.html
index 80855446..fd3c6d87 100644
--- a/src/program/templates/speaker_list.html
+++ b/src/program/templates/speaker_list.html
@@ -7,6 +7,10 @@
   event anchors at BornHack 2016.
 </p>
 
+<a href="{% url 'call_for_speakers' camp_slug=camp.slug %}" class="btn btn-primary"><span {% if not camp.call_for_speakers_open %}style="text-decoration: line-through;"{% endif %}>"Call for Speakers" for {{ camp.title }}</span></a>
+
+<hr />
+
 <div class="list-group">
   {% for speaker in speaker_list %}
   <a href="{% url 'speaker_detail' camp_slug=camp.slug slug=speaker.slug %}" class="list-group-item">
diff --git a/src/program/views.py b/src/program/views.py
index 8e59e9cf..97f257da 100644
--- a/src/program/views.py
+++ b/src/program/views.py
@@ -61,7 +61,7 @@ class SpeakerProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureUserOwn
 
     def form_valid(self, form):
         if form.instance.proposal_status == models.UserSubmittedModel.PROPOSAL_PENDING:
-            messages.info(self.request, "Your speaker proposal has been reverted to status draft. Please submit it again when you are ready.")
+            messages.warning(self.request, "Your speaker proposal has been reverted to status draft. Please submit it again when you are ready.")
             form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_DRAFT
         return super().form_valid(form)
 
@@ -126,7 +126,7 @@ class EventProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsP
 
     def form_valid(self, form):
         if form.instance.proposal_status == models.UserSubmittedModel.PROPOSAL_PENDING:
-            messages.info(self.request, "Your event proposal has been reverted to status draft. Please submit it again when you are ready.")
+            messages.warning(self.request, "Your event proposal has been reverted to status draft. Please submit it again when you are ready.")
             form.instance.proposal_status = models.UserSubmittedModel.PROPOSAL_DRAFT
         return super().form_valid(form)
 
diff --git a/src/templates/base.html b/src/templates/base.html
index f205617a..c787bf62 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -85,10 +85,7 @@
             <a class="btn {% menubuttonclass 'villages' %}" href="{% url 'village_list' camp_slug=camp.slug %}">Villages</a>
             <a class="btn {% menubuttonclass 'program' %}" href="{% url 'schedule_index' camp_slug=camp.slug %}">Program</a>
             <a class="btn {% menubuttonclass 'sponsors' %}" href="{% url 'sponsors' camp_slug=camp.slug %}">Sponsors</a>
-            {% if not camp.read_only %}
-                <a class="btn {% menubuttonclass 'teams' %}"
-                   href="{% url 'team_list' camp_slug=camp.slug %}">Teams</a>
-            {% endif %}
+            <a class="btn {% menubuttonclass 'teams' %}" href="{% url 'team_list' camp_slug=camp.slug %}">Teams</a>
           </div>
           <div class="btn-group-vertical visible-xs">
             <a class="btn {% menubuttonclass 'camps' %}" href="{% url 'camp_detail' camp_slug=camp.slug %}">{{ camp.title }}</a>
@@ -96,10 +93,7 @@
             <a class="btn {% menubuttonclass 'villages' %}" href="{% url 'village_list' camp_slug=camp.slug %}">Villages</a>
             <a class="btn {% menubuttonclass 'program' %}" href="{% url 'schedule_index' camp_slug=camp.slug %}">Program</a>
             <a class="btn {% menubuttonclass 'sponsors' %}" href="{% url 'sponsors' camp_slug=camp.slug %}">Sponsors</a>
-            {% if not camp.read_only %}
-                <a class="btn {% menubuttonclass 'teams' %}"
-                   href="{% url 'team_list' camp_slug=camp.slug %}">Teams</a>
-            {% endif %}
+            <a class="btn {% menubuttonclass 'teams' %}" href="{% url 'team_list' camp_slug=camp.slug %}">Teams</a>
           </div>
         <p>
       </div>