diff --git a/.idea/PyRIGS.iml b/.idea/PyRIGS.iml
index 28c5f8b9..f6cbf3c5 100644
--- a/.idea/PyRIGS.iml
+++ b/.idea/PyRIGS.iml
@@ -11,7 +11,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 2.7.5 virtualenv at ~/pyrigs" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 2.7.6 virtualenv at D:\Users\Ghost\.virtualenvs\pyrigs" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="sass-stdlib" level="application" />
   </component>
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 5cabf5c9..f2b8fe89 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -4,7 +4,7 @@
     <data-source source="LOCAL" name="Django default" uuid="09730cb6-cd27-4034-9959-d242e7905a51">
       <driver-ref>sqlite.xerial</driver-ref>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url>
+      <jdbc-url>jdbc:sqlite:D:\Users\Ghost\PycharmProjects\pyrigs\db.sqlite3</jdbc-url>
       <libraries />
     </data-source>
   </component>
diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index 8a47e84a..7f0eba3f 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -99,6 +99,17 @@ USE_L10N = True
 
 USE_TZ = True
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.core.context_processors.request",
+    "django.contrib.messages.context_processors.messages",
+)
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
diff --git a/RIGS/templates/RIGS/person_detail.html b/RIGS/templates/RIGS/person_detail.html
index a126e198..5e80cd98 100644
--- a/RIGS/templates/RIGS/person_detail.html
+++ b/RIGS/templates/RIGS/person_detail.html
@@ -4,15 +4,17 @@
 {% block title %}{{ object.name }}{% endblock %}
 
 {% block content %}
-    <div class="col-sm-10 col-sm-offset-1">
-        <h3>{{ object.name }}</h3>
+    <div class="row">
+        {% if not request.is_ajax %}
+            <h3>{{ object.name }}</h3>
 
-        <div class="pull-right">
-            <a href="{% url 'person_update' object.pk %}" class="btn btn-primary">Edit <span
-                    class="glyphicon glyphicon-pencil"></span></a>
-        </div>
-        <div class="row col-sm-12">
-            <div class="col-sm-6">
+            <div class="pull-right">
+                <a href="{% url 'person_update' object.pk %}" class="btn btn-primary">Edit <span
+                        class="glyphicon glyphicon-pencil"></span></a>
+            </div>
+        {% endif %}
+        <div class="col-sm-10 col-sm-offset-1">
+            <div class="">
                 <dl class="dl-horizontal">
                     <dt>Name</dt>
                     <dd>{{ object.name }}</dd>
@@ -32,4 +34,13 @@
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% if request.is_ajax %}
+    {% block footer %}
+        <div class="pull-right">
+            <a href="{% url 'person_update' object.pk %}" class="btn btn-primary">Edit <span
+                    class="glyphicon glyphicon-pencil"></span></a>
+        </div>
+    {% endblock %}
+{% endif %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/person_list.html b/RIGS/templates/RIGS/person_list.html
index 46093097..7099a9df 100644
--- a/RIGS/templates/RIGS/person_list.html
+++ b/RIGS/templates/RIGS/person_list.html
@@ -28,7 +28,12 @@
                         <td>{{ person.email }}</td>
                         <td>{{ person.phone }}</td>
                         <td>{{ person.notes|yesno|capfirst }}</td>
-                        <td>Add buttons</td>
+                        <td>
+                            <a href="{% url 'person_detail' person.pk %}" class="btn btn-default" data-toggle="modal" data-target="#modal">
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </a>
+                            <a href="{% url 'person_update' person.pk %}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
+                        </td>
                     </tr>
                 {% empty %}
                     <tr>