diff --git a/smash/web/templates/appointments/edit.html b/smash/web/templates/appointments/edit.html
index c74b9c982ab89bbb7eba9ad2573ec21eb9869108..11e0a47655c31204185c9e024137db7040ce8252 100644
--- a/smash/web/templates/appointments/edit.html
+++ b/smash/web/templates/appointments/edit.html
@@ -23,11 +23,17 @@
 {% block maincontent %}
 
     {% block content %}
+        <div class="row">
+            <p class="col-lg-3 pull-left">
+                <a href="javascript:history.back(1)" class="btn btn-block btn-default">Go
+                    back (discard changes)</a>
+            </p>
+            <p class="col-md-2 pull-right">
+                <a href="{% url 'web.views.visit_details' appointment.visit.id %}" type="button"
+                   class="btn btn-block btn-default">View corresponding visit</a>
+            </p>
+        </div>
         <div class="box box-info">
-            <div class="box-header with-border">
-                <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default" onclick="history.back()">Go
-                    back (without changes)</a>
-            </div>
 
             {% comment %} <div class="box-header with-border">
 		<h3 class="box-title">Details of appointment</h3>
diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html
index 4187da02173f53056f75e39e8942148cd506cc71..d3cd52aae7946204bc849ce185a5f1259cc76658 100644
--- a/smash/web/templates/subjects/details.html
+++ b/smash/web/templates/subjects/details.html
@@ -23,8 +23,7 @@
     {% block content %}
         <div class="box box-info">
             <div class="box-header with-border">
-                <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
-                   onclick="history.back()">Back</a>
+                <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
             </div>
 
             {% comment %} <div class="box-header with-border">
@@ -57,7 +56,7 @@
 
 
                 <div class="box-footer">
-                    <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Back</a>
+                    <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
                 </div><!-- /.box-footer -->
             </form>
         </div>
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 22c88550ac80adf6f9eb9a8e04e412b804314afb..956823144048a7cdf7829f6b6976059d3ecb4958 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -26,9 +26,9 @@
     {% block content %}
         <div class="row">
             <p class="col-lg-3 pull-left">
-                <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
-                   onclick="history.back()">Go
-                    back (discard changes)</a>
+                <a href="javascript:history.back(1)" class="btn btn-block btn-default"
+                ">Go
+                back (discard changes)</a>
             </p>
             <p class="col-md-2 pull-right">
                 <a href="{% url 'web.views.subject_visit_details' subject.id %}" type="button"
diff --git a/smash/web/templates/subjects/visitdetails.html b/smash/web/templates/subjects/visitdetails.html
index 3901572f8a56b33a6a2899263dfce4fa4f9394dc..8ec7b079ca31e092a9c3045dd0367ec5795ef129 100644
--- a/smash/web/templates/subjects/visitdetails.html
+++ b/smash/web/templates/subjects/visitdetails.html
@@ -23,8 +23,7 @@
     {% block content %}
         <div class="box box-info">
             <div class="box-header with-border">
-                <a href="{% url 'web.views.visits' %}" class="btn btn-block btn-default"
-                   onclick="history.back()">Back</a>
+                <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
                 <a href="{% url 'web.views.visit_add' id %}" type="button" class="btn btn-block btn-default">Add
                     visit</a>
             </div>
diff --git a/smash/web/templates/visits/details.html b/smash/web/templates/visits/details.html
index db9aaab5303d7839042991a5b06bbfa3364231d7..2f0e96d02ec046d9a9284949f9f5bff7e1535970 100644
--- a/smash/web/templates/visits/details.html
+++ b/smash/web/templates/visits/details.html
@@ -25,8 +25,7 @@
     {% block content %}
         <div class="box box-info">
             <div class="box-header with-border">
-                <a href="{% url 'web.views.visits' %}" class="btn btn-block btn-default"
-                   onclick="history.back()">Back</a>
+                <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
                 <a href="{% url 'web.views.subject_visit_details' visit.subject.id %}" type="button"
                    class="btn btn-block btn-default">Subject's visits</a>
             </div>
@@ -177,7 +176,7 @@
                 <div class="box-footer">
                     <td><a href="{% url 'web.views.subject_edit' visit.subject.id %}" type="button"
                            class="btn btn-block btn-default">Edit subject</a></td>
-                    <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Back</a>
+                    <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
                 </div><!-- /.box-footer -->
             </form>
         </div>