diff --git a/smash/web/templates/assignments/details.html b/smash/web/templates/assignments/details.html
index 3086e4374133d5f1dd447bb512d094e6de16a344..39a97f2d09c13d1db18de2f77f953aa953645b9a 100644
--- a/smash/web/templates/assignments/details.html
+++ b/smash/web/templates/assignments/details.html
@@ -22,7 +22,7 @@
 {% block content %}
 <div class="box box-info">
 	<div class="box-header with-border">
-		<a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default">Go back</a>
+		<a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back</a>
 	</div>
 
 	{% comment %} <div class="box-header with-border">
@@ -53,7 +53,7 @@
 		</div><!-- /.box-body -->
 
 		<div class="box-footer">
-			<a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default">Go back</a>
+			<a href="{% url 'web.views.assignments' %}" class="btn btn-block btn-default" onclick="history.back()">Go back</a>
 		</div><!-- /.box-footer -->
 	</form>
 </div>
diff --git a/smash/web/templates/assignments/index.html b/smash/web/templates/assignments/index.html
index f3ae2cf8b336251a0136c47e1e04258a57db706f..e32aa2051683348bce4d5aa842555fd52fd056c9 100644
--- a/smash/web/templates/assignments/index.html
+++ b/smash/web/templates/assignments/index.html
@@ -26,11 +26,9 @@
 	<div class="col-md-5">
 		<h3>Planning</h3>
 
-
-
-    {% if planning_list %}
-  	<table id="planning_table" class="table table-bordered table-striped">
-      <thead>
+    	{% if planning_list %}
+  		<table id="planning_table" class="table table-bordered table-striped">
+      		<thead>
 				<tr>
 					<th>Subject name</th>
 					<th>Full information</th>
@@ -38,55 +36,66 @@
 					<th>Details</th>
 				</tr>
 			</thead>
-  	<tbody>
-
-      {% for planned in planning_list %}
-  		<tr>
-  			<td>{{planned.visit.subject.firstName}} {{planned.visit.subject.lastName}}</td>
-        <td><button type="button" class="btn btn-block btn-default btn-xs">See full information</button></td>
-        <td>{{planned.appDateTime}}</td>
-        <td><button type="button" class="btn btn-block btn-default">Details</button></td>
-  		</tr>
-      {% endfor %}
-
-  	</tbody>
-  	</table>
-    {% else %}
-      <p>No visits to plan in close future.</p>
-    {% endif %}
-
+  			<tbody>
+		      {% for planned in planning_list %}
+		  		<tr>
+		  			<td>{{ planned.visit.subject.firstName }} {{ planned.visit.subject.lastName }}</td>
+		        	<td>
+		        		<button type="button" class="btn btn-block btn-default btn-xs">See full information</button>
+		        	</td>
+		        	<td>
+		        		{{ planned.appDateTime }}
+		        	</td>
+		        	<td>
+		        		<button type="button" class="btn btn-block btn-default">Details</button>
+		        	</td>
+		  		</tr>
+		      {% endfor %}
+  			</tbody>
+  		</table>
+
+    	{% else %}
+      		<p>No visits to plan in close future.</p>
+    	{% endif %}
+
+    	<hr />
 
 		<h3>Approaching</h3>
 
-    {% if approaching_list %}
-		<table id="approaching_table" class="table table-bordered table-striped">
-			<thead>
-				<tr>
-					<th>Subject name</th>
-					<th>Full information</th>
-					<th>Date</th>
-					<th>Time</th>
-					<th>Details</th>
-				</tr>
-			</thead>
-		<tbody>
-
-      {% for approach in approaching_list %}
-  		<tr>
-  			<td>{{approach.visit.subject.firstName}} {{approach.visit.subject.lastName}}</td>
-        <td><a href="{% url 'web.views.subjectdet' approach.visit.subject.id %}" type="button" class="btn btn-block btn-default">Subject's details</a></td>
-        <td>{{approach.appDateTime|date:"d-M-Y" }}</td>
-        <td>{{approach.appDateTime|time:"H:i"}}</td>
-        <td><a href="{% url 'web.views.assignmentdetails' approach.id %}" type="button" class="btn btn-block btn-default">Details</a></td>
-  		</tr>
-      {% endfor %}
-
-		</tbody>
-		</table>
-
-    {% else %}
-      <p>No visits approaching in close future.</p>
-    {% endif %}
+    	{% if approaching_list %}
+			<table id="approaching_table" class="table table-bordered table-striped">
+				<thead>
+					<tr>
+						<th>Subject name</th>
+						<th>Full information</th>
+						<th>Date</th>
+						<th>Time</th>
+						<th>Details</th>
+					</tr>
+				</thead>
+				<tbody>
+
+      			{% for approach in approaching_list %}
+  				<tr>
+  					<td>
+  						{{ approach.visit.subject.firstName }} {{ approach.visit.subject.lastName }}
+  					</td>
+        			<td>
+        				<a href="{% url 'web.views.subjectdet' approach.visit.subject.id %}" type="button" class="btn btn-block btn-default">Subject's details</a>
+        			</td>
+        			<td>{{ approach.appDateTime | date:"d-M-Y" }}</td>
+        			<td>{{ approach.appDateTime | time:"H:i" }}</td>
+        			<td>
+        				<a href="{% url 'web.views.assignmentdetails' approach.id %}" type="button" class="btn btn-block btn-default">Details</a>
+        			</td>
+  				</tr>
+		      	{% endfor %}
+				</tbody>
+			</table>
+
+    	{% else %}
+      		<p>No visits approaching in close future.</p>
+    	{% endif %}
 	</div>
 
 	<div class="col-md-7">