diff --git a/smash/web/models.py b/smash/web/models.py
index f633291e18d3c7d606e98e12efc0f3f59a23cc8e..1454418ace8f9b0fa689d092a2da0a82ab86db72 100644
--- a/smash/web/models.py
+++ b/smash/web/models.py
@@ -35,6 +35,7 @@ class Subject(models.Model):
     address = models.CharField(max_length=255)
     postalCode = models.CharField(max_length=6)
     city = models.CharField(max_length=50)
+    country = models.CharField(max_length=50)
     screeningNo = models.CharField(max_length=50)
     ndno = models.CharField(max_length=6)
     visitNumber = models.IntegerField()
diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index a941056626e8e3e37e97bca5231fcc55839bb49b..f41c1cbf5eb5aa33bea79e6870ada172af5cad20 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -11,7 +11,7 @@
 {% block page_header %}Subjects{% endblock page_header %}
 {% block page_description %}{% endblock page_description %}
 
-{% block breadcrumb %}	
+{% block breadcrumb %}
 			  <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
 			  <li class="active">Subjects</li>
 {% endblock breadcrumb %}
@@ -25,81 +25,57 @@
 </div>
 
 <div class="box-body">
-	<table id="table" class="table table-bordered table-striped">
+  {% if subjects_list %}
+  <table id="table" class="table table-bordered table-striped">
 		<thead>
 			<tr>
 				<th>No.</th>
 				<th>First name</th>
 				<th>Last name</th>
 				<th>Country</th>
-				<th>Language</th>
+				<th>Languages</th>
 				<th>Type</th>
 				<th>Last visit</th>
 				<th>Details</th>
 				<th>Edit</th>
-				<th>Resigned</th>
+        <th>Delete</th>
 			</tr>
 		</thead>
 	<tbody>
+    {% for subject in subjects_list %}
 		<tr>
-			<td>#1</td>
-			<td>Johny</td>
-			<td>English</td>
-			<td>Luxembourg</td>
-			<td><span class="label label-success">english</span></td>
-			<td>Patient - IPD</td>
-			<td>12-10-2016</td>
-			<td><button type="button" class="btn btn-block btn-default">Details</button></td>
-			<td><button type="button" class="btn btn-block btn-default">Edit</button></td>
-			<td>
-				<span class="label label-info">No</span>
-			</td>
-		</tr>
-		<tr>
-			<td>#2</td>
-			<td>Henry</td>
-			<td>French</td>
-			<td>France</td>
+			<td>{{ forloop.counter }}</td>
+			<td>{{ subject.firstName }}</td>
+      <td>{{ subject.lastName }}</td>
+      <td>{{ subject.country }}</td>
 			<td>
-				<span class="label label-success">english</span>
-				<span class="label label-success">french</span>
-			</td>
-			<td>Patient - IPD</td>
-			<td>12-10-2015</td>
-			<td><button type="button" class="btn btn-block btn-default">Details</button></td>
-			<td><button type="button" class="btn btn-block btn-default">Edit</button></td>
-			<td>
-				<span class="label label-info">No</span>
-			</td>
-		</tr>
-		<tr>
-			<td>#3</td>
-			<td>Karim</td>
-			<td>English</td>
-			<td>Luxembourg</td>
-			<td>
-				<span class="label label-success">english</span>
-				<span class="label label-success">french</span>
-			</td>
-			<td>Control</td>
+        {% autoescape off %}
+        {% for language in subject.languages.all %}
+          {{language.image_img}}
+        {% endfor %}
+        {% endautoescape %}
+      </td>
+			<td>{{ subject.subjectStatus }}</td>
 			<td>12-10-2016</td>
 			<td><button type="button" class="btn btn-block btn-default">Details</button></td>
 			<td><button type="button" class="btn btn-block btn-default">Edit</button></td>
-			<td>
-				<span class="label label-info">No</span>
-			</td>
+      <td><button type="button" class="btn btn-block btn-default">Delete</button></td>
 		</tr>
+    {% endfor %}
 	</tbody>
 	</table>
+  {% else %}
+    <p>No subjects found.</p>
+  {% endif %}
 </div>
 {% endblock maincontent %}
 
 {% block scripts %}
 	{{ block.super }}
-	
+
 	<script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
 	<script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
-	
+
 	<script>
 		$(function () {
 			$('#table').DataTable({
diff --git a/smash/web/views.py b/smash/web/views.py
index e3312162288cde2c1fe3e89f443e111a5b9b27e3..5bb0614f6510e4e8be87304cb4f37a774b94a56b 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -2,6 +2,7 @@ from django.shortcuts import render
 from django.http import HttpResponse
 from django.template import loader
 from django.views import generic
+from .models import *
 
 # Create your views here.
 def index(request):
@@ -17,9 +18,13 @@ def assignments(request):
 
 
 def subjects(request):
+	subjects_list = Subject.objects.order_by('-lastName')
 	template = loader.get_template("subjects/index.html")
-	return HttpResponse(template.render({
-	}), request)
+	context = {
+		'subjects_list': subjects_list
+	}
+
+	return HttpResponse(template.render(context,request))
 
 
 def doctors(request):