diff --git a/course/flow.py b/course/flow.py
index 74658340e177be1f50a652043507886e1181cb20..39a1466af605cfda410b1707a7d6527667cc01db 100644
--- a/course/flow.py
+++ b/course/flow.py
@@ -1775,6 +1775,7 @@ def view_flow_page(pctx, flow_session_id, ordinal):
 
     answer_visit = None
     prev_visit_id = None
+    viewing_prior_version = False
 
     if request.method == "POST":
         if "finish" in request.POST:
@@ -1813,7 +1814,6 @@ def view_flow_page(pctx, flow_session_id, ordinal):
             except ValueError:
                 raise SuspiciousOperation("non-integer passed for 'visit_id'")
 
-        viewing_prior_version = False
         if prev_answer_visits and prev_visit_id is not None:
             answer_visit = prev_answer_visits[0]
 
@@ -1827,13 +1827,17 @@ def view_flow_page(pctx, flow_session_id, ordinal):
 
             if viewing_prior_version:
                 from django.template import defaultfilters
-                messages.add_message(request, messages.INFO,
-                    _("Viewing prior submission dated %(date)s.")
+                messages.add_message(request, messages.INFO, (
+                    _("Viewing prior submission dated %(date)s. ")
                     % {
                         "date": defaultfilters.date(
-                            as_local_time(pvisit.visit_time),
+                            as_local_time(answer_visit.visit_time),
                             "DATETIME_FORMAT"),
-                        })
+                    }
+                    +
+                    '<a class="btn btn-default btn-sm" href="?" '
+                    'role="button">&laquo; %s</a>'
+                    % _("Go back")))
 
             prev_visit_id = answer_visit.id
 
@@ -2013,6 +2017,7 @@ def view_flow_page(pctx, flow_session_id, ordinal):
         "interaction_kind": get_interaction_kind(
             fpctx, flow_session, generates_grade, all_page_data),
 
+        "viewing_prior_version": viewing_prior_version,
         "prev_answer_visits": prev_answer_visits,
         "prev_visit_id": prev_visit_id,
     }
@@ -2245,7 +2250,6 @@ def send_email_about_flow_page(pctx, flow_session_id, ordinal):
     page_id = FlowPageData.objects.get(
         flow_session=flow_session_id, ordinal=ordinal).page_id
 
-    from django.core.urlresolvers import reverse
     review_url = reverse(
         "relate-view_flow_page",
         kwargs={'course_identifier': pctx.course.identifier,
diff --git a/course/templates/course/flow-page.html b/course/templates/course/flow-page.html
index a85fd3b3bddb47f262f8459c1dfb99b9fda58bb7..c17bba35d2198f1f56aa3f4eaa59e8eeb373c43a 100644
--- a/course/templates/course/flow-page.html
+++ b/course/templates/course/flow-page.html
@@ -166,6 +166,7 @@
 
       <div class="navbar-right relate-flow-submit"
         style="padding-right: 0.4em;">
+      {% if not viewing_prior_version %}
         <button type="submit" name="finish" class="btn btn-default relate-nav-button
         {% if flow_session.in_progress %}
           {% if not interaction_kind == flow_session_interaction_kind.noninteractive %}
@@ -201,13 +202,14 @@
             <i class="fa fa-sign-out" aria-hidden="true"></i>
         {% endif %}
         </button>
+      {% endif %}
       </div>
 
       {# }}} #}
 
       {# {{{ expiration mode #}
 
-      {% if flow_session.in_progress and expiration_mode_choice_count > 1 %}
+      {% if flow_session.in_progress and expiration_mode_choice_count > 1 and not viewing_prior_version %}
         <div class="flow-session-expiration-panel">
           <span id="expiration_mode_change_progress">
           </span>