diff --git a/billard/templates/billard/locationdata_detail.html b/billard/templates/billard/locationdata_detail.html
new file mode 100644
index 0000000..de332c9
--- /dev/null
+++ b/billard/templates/billard/locationdata_detail.html
@@ -0,0 +1,57 @@
+{% extends 'billard/base.html' %}
+
+{% block title %}Location Data{% endblock %}
+
+{% block content %}
+    <h1>Locationdata: {{ locationdata.id }}</h1>
+
+    {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+    <form action="{% url 'index' %}" method="post" class="form-horizontal">
+        {% csrf_token %}
+        <div class="form-group">
+            <label for="location_id" class="col-sm-2 control-label">Location Id</label>
+            <div class="col-sm-10">
+                <input id="location_id" type="text" name="location_id" value="{{ locationdata.location_id }}"
+                       placeholder="Locaton" class="form-control" disabled="disabled"/>
+            </div>
+            <div class="form-group">
+                <label for="table_no" class="col-sm-2 control-label">Table Number</label>
+                <div class="col-sm-10">
+                    <input id="table_no" type="number" name="table_no" value="{{ locationdata.table_no }}"
+                           placeholder="Table" class="form-control" min="1" max="8" disabled="disabled"/>
+                </div>
+                <div class="form-group">
+                    <label for="tst" class="col-sm-2 control-label">Timestamp</label>
+                    <div class="col-sm-10">
+                        <input id="tst" type="datetime" name="tst" value="{{ locationdata.tst }}"
+                               placeholder="Table" class="form-control" disabled="disabled"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="on_off" class="col-sm-2 control-label">On / Off</label>
+                    <div class="col-sm-10">
+                        <input id="on_off" type="checkbox" name="on_off" value="{{ locationdata.on_off }}"
+                               placeholder="Table" class="form-control" disabled="disabled"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="processed" class="col-sm-2 control-label">Processed</label>
+                    <div class="col-sm-10">
+                        <input id="processed" type="checkbox" name="processed" value="{{ locationdata.processed }}"
+                               placeholder="Table" class="form-control" disabled="disabled"/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="error_msg" class="col-sm-2 control-label">Error Message</label>
+                    <div class="col-sm-10">
+                        <input id="error_msg" type="text" name="error_msg" value="{{ locationdata.error_msg }}"
+                               placeholder="Table" class="form-control" disabled="disabled"/>
+                    </div>
+                </div>
+                <button type="submit" class="btn btn-default">Abschicken</button>
+                <a class="btn btn-default" href=".." role="button">Zurück</a>
+    </form>
+{% endblock %}
+
+
diff --git a/billard/templates/billard/locationdata_list.html b/billard/templates/billard/locationdata_list.html
index 46853a5..f4fd71d 100644
--- a/billard/templates/billard/locationdata_list.html
+++ b/billard/templates/billard/locationdata_list.html
@@ -17,7 +17,7 @@
         </tr>
     {% for location_data in object_list %}
         <tr>
-            <td>{{ location_data.id }}</td>
+            <td><a href="{% url 'detail' location_data.id %}">{{ location_data.id }}</a></td>
             <td>{{ location_data.location_id }}</td>
             <td>{{ location_data.table_no }}</td>
             <td>{{ location_data.tst }}</td>
diff --git a/billard/urls.py b/billard/urls.py
index 8e55874..33497af 100644
--- a/billard/urls.py
+++ b/billard/urls.py
@@ -10,5 +10,6 @@ router.register(r'location_data', views.LocationDataViewSet)
 
 urlpatterns = [
     url(r'^$', views.IndexView.as_view(), name='index'),
+    url(r'^(?P<pk>[0-9]+)/$', views.LocationDataDetailView.as_view(), name='detail'),
     url(r'api/v1/', include(router.urls)),
 ]
diff --git a/billard/views.py b/billard/views.py
index 069bf13..d7d2b8c 100644
--- a/billard/views.py
+++ b/billard/views.py
@@ -2,6 +2,7 @@ from billard.serializers import *
 from .models import LocationData
 from rest_framework import viewsets
 from django.views import generic
+from django.views.generic.detail import DetailView
 
 
 class ClientViewSet(viewsets.ModelViewSet):
@@ -27,3 +28,6 @@ class LocationDataViewSet(viewsets.ModelViewSet):
 class IndexView(generic.ListView):
     model = LocationData
 
+
+class LocationDataDetailView(DetailView):
+    model = LocationData
diff --git a/caromserver/urls.py b/caromserver/urls.py
index ffcdb96..a8a57cd 100644
--- a/caromserver/urls.py
+++ b/caromserver/urls.py
@@ -15,9 +15,11 @@ Including another URLconf
 """
 from django.conf.urls import url, include
 from django.contrib import admin
+from django.views.generic import RedirectView
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^billard/', include('billard.urls')),
+    url(r'^.*$', RedirectView.as_view(url='billard/', permanent=False), name='index')
 ]