diff --git a/application/templates/student_page.html b/application/templates/student_page.html
index 8a167db..0812182 100644
--- a/application/templates/student_page.html
+++ b/application/templates/student_page.html
@@ -4,7 +4,7 @@
     <ul>
         {% for tag in tags %}
         <li>{{tag}}
-            <a class="btn btn-outline-dark" href="{% url 'tag_remove' %}">
+            <a class="btn btn-outline-dark" href="{% url 'tag_remove' tag.slug %}">
                 <span class="glyphicon glyphicon-remove">Remove</span>
             </a>
         </li>
diff --git a/application/templates/tag_list.html b/application/templates/tag_list.html
index a1f23f0..2304ec0 100644
--- a/application/templates/tag_list.html
+++ b/application/templates/tag_list.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %} {% block content %} {% load taggit_templatetags2_tags %} 
-{% get_taglist as tags for 'application.customuser'%}
 
 
 <div id="">
diff --git a/application/urls.py b/application/urls.py
index e7167ea..7dee351 100644
--- a/application/urls.py
+++ b/application/urls.py
@@ -7,7 +7,6 @@ urlpatterns = [
     url(r'^$', views.post_list, name='post_list'),
     url(r'^tag/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
     url(r'^taglist/$', views.tag_list, name='tag_list'),
-    url(r'^taglist/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
     url(r'^student/', views.student_page, name='student_page'),
     url(r'^search/', views.blog_search_list_view, name='blog_search_list_view'),
     url(r'^post/(?P<pk>\d+)/$', views.post_detail, name='post_detail'),
@@ -16,7 +15,7 @@ urlpatterns = [
     url(r'^drafts/$', views.post_draft_list, name='post_draft_list'),
     url(r'^post/(?P<pk>\d+)/publish/$', views.post_publish, name='post_publish'),
     url(r'^post/(?P<pk>\d+)/remove/$', views.post_remove, name='post_remove'),
-    url(r'^student/remove/$', views.tag_remove, name='tag_remove'),
+    url(r'^student/(?P<slug>[-\w]+)/remove/$', views.tag_remove, name='tag_remove'),
     url(r'^tags/', include('taggit_templatetags2.urls')),
 ]
 
diff --git a/application/views.py b/application/views.py
index a7574e5..a898033 100644
--- a/application/views.py
+++ b/application/views.py
@@ -118,12 +118,11 @@ def post_remove(request, pk):
 
 
 @login_required
-def tag_remove(request):
-    tag_to_delete = CustomUser.objects.get(tags)
-    obj.user = request.user
-    obj.save()
-    obj.tags.tag_remove(tag_to_delete)
-    obj.save_m2m()
+def tag_remove(request, slug=None):
+    if slug:
+        tag = get_object_or_404(Tag, slug=slug)
+        tag.delete()
+        save_m2m()
     return redirect('student_page')
 
 @login_required
@@ -142,15 +141,21 @@ def student_page(request):
 
     else:
         form = NewTagForm()
-    
     return render(request, 'student_page.html', {'form':form})
 
 @login_required
 def tag_list(request):
-    u= CustomUser.objects.get(user=request.user)
-    tags= Tag.objects.filter(name=u)
-    return render(request, 'tag_list.html', locals())
-    
+    u = CustomUser.objects.get(user=request.user)
+    tags= Tag.objects.filter(customuser=u)
+    arr=[]
+    arr.append(tags)
+    """
+    for tag in tags:
+        arr.append(str(tag))
+        """
+    listing = list(arr)
+    return render(request, 'tag_list.html', {'tags':tags})
+
 
 class TagSearch(TagCanvasListView):
     template_name = 'blog_search_list_view.html'
@@ -178,3 +183,17 @@ def blog_search_list_view(request):
 
 def tag_cloud(request):
     return render(request, 'tag_cloud.html', {})
+
+"""
+@login_required
+def post_of_user_list(request):
+    u= CustomUser.objects.get(user=request.user)
+    tag =[]
+
+    posts = Post.objects.filter(published_date__lte=timezone.now()).order_by('published_date')
+    if slug:
+        tag = get_object_or_404(Tag, slug=slug)
+        posts= posts.filter(tags__in=[tag])
+    page = request.GET.get('page')
+    return render(request, 'post_list.html', locals())
+"""
\ No newline at end of file
diff --git a/doc/graduate-thesis/Chapters/Chapter1.tex b/doc/graduate-thesis/Chapters/Chapter1.tex
index e3bf71c..c3074d3 100644
--- a/doc/graduate-thesis/Chapters/Chapter1.tex
+++ b/doc/graduate-thesis/Chapters/Chapter1.tex
@@ -2,16 +2,12 @@
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at pulvinar nisi. Phasellus hendrerit, diam placerat interdum iaculis, mauris justo cursus risus, in viverra purus eros at ligula. Ut metus justo, consequat a tristique posuere, laoreet nec nibh. Etiam et scelerisque mauris. Phasellus vel massa magna. Ut non neque id tortor pharetra bibendum vitae sit amet nisi. Duis nec quam quam, sed euismod justo. Pellentesque eu tellus vitae ante tempus malesuada. Nunc accumsan, quam in congue consequat, lectus lectus dapibus erat, id aliquet urna neque at massa. Nulla facilisi. Morbi ullamcorper eleifend posuere. Donec libero leo, faucibus nec bibendum at, mattis et urna. Proin consectetur, nunc ut imperdiet lobortis, magna neque tincidunt lectus, id iaculis nisi justo id nibh. Pellentesque vel sem in erat vulputate faucibus molestie ut lorem.
 
-\section{Kapitel}
+\section{Ausgangsituation}
 
 Quisque tristique urna in lorem laoreet at laoreet quam congue. Donec dolor turpis, blandit non imperdiet aliquet, blandit et felis. In lorem nisi, pretium sit amet vestibulum sed, tempus et sem. Proin non ante turpis. Nulla imperdiet fringilla convallis. Vivamus vel bibendum nisl. Pellentesque justo lectus, molestie vel luctus sed, lobortis in libero. Nulla facilisi. Aliquam erat volutpat. Suspendisse vitae nunc nunc. Sed aliquet est suscipit sapien rhoncus non adipiscing nibh consequat. Aliquam metus urna, faucibus eu vulputate non, luctus eu justo.
 
-\subsection{Kapitel}
 
-Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
-
-\section{Kapitel}
+\section{Ziel der Arbeit}
 
 Phasellus nisi quam, volutpat non ullamcorper eget, congue fringilla leo. Cras et erat et nibh placerat commodo id ornare est. Nulla facilisi. Aenean pulvinar scelerisque eros eget interdum. Nunc pulvinar magna ut felis varius in hendrerit dolor accumsan. Nunc pellentesque magna quis magna bibendum non laoreet erat tincidunt. Nulla facilisi.
-
-Duis eget massa sem, gravida interdum ipsum. Nulla nunc nisl, hendrerit sit amet commodo vel, varius id tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ac dolor est. Suspendisse ultrices tincidunt metus eget accumsan. Nullam facilisis, justo vitae convallis sollicitudin, eros augue malesuada metus, nec sagittis diam nibh ut sapien. Duis blandit lectus vitae lorem aliquam nec euismod nisi volutpat. Vestibulum ornare dictum tortor, at faucibus justo tempor non. Nulla facilisi. Cras non massa nunc, eget euismod purus. Nunc metus ipsum, euismod a consectetur vel, hendrerit nec nunc.
\ No newline at end of file
+Duis eget massa sem, gravida interdum ipsum. Nulla nunc nisl, hendrerit sit amet commodo vel, varius id tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc ac dolor est. Suspendisse ultrices tincidunt metus eget accumsan. Nullam facilisis, justo vitae convallis sollicitudin, eros augue malesuada metus, nec sagittis diam nibh ut sapien. Duis blandit lectus vitae lorem aliquam nec euismod nisi volutpat. Vestibulum ornare dictum tortor, at faucibus justo tempor non. Nulla facilisi. Cras non massa nunc, eget euismod purus. Nunc metus ipsum, euismod a consectetur vel, hendrerit nec nunc.
diff --git a/doc/graduate-thesis/Chapters/Chapter2.log b/doc/graduate-thesis/Chapters/Chapter2.log
new file mode 100644
index 0000000..e69de29
diff --git a/doc/graduate-thesis/Chapters/Chapter2.tex b/doc/graduate-thesis/Chapters/Chapter2.tex
new file mode 100644
index 0000000..0f8e90f
--- /dev/null
+++ b/doc/graduate-thesis/Chapters/Chapter2.tex
@@ -0,0 +1,20 @@
+\chapter{Framework}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at pulvinar nisi. Phasellus hendrerit, diam placerat interdum iaculis, mauris justo cursus risus, in viverra purus eros at ligula. Ut metus justo, consequat a tristique posuere, laoreet nec nibh. Etiam et scelerisque mauris. Phasellus vel massa magna. Ut non neque id tortor pharetra bibendum vitae sit amet nisi. Duis nec quam quam, sed euismod justo. Pellentesque eu tellus vitae ante tempus malesuada. Nunc accumsan, quam in congue consequat, lectus lectus dapibus erat, id aliquet urna neque at massa. Nulla facilisi. Morbi ullamcorper eleifend posuere. Donec libero leo, faucibus nec bibendum at, mattis et urna. Proin consectetur, nunc ut imperdiet lobortis, magna neque tincidunt lectus, id iaculis nisi justo id nibh. Pellentesque vel sem in erat vulputate faucibus molestie ut lorem.
+
+\section{Django}
+
+Quisque tristique urna in lorem laoreet at laoreet quam congue. Donec dolor turpis, blandit non imperdiet aliquet, blandit et felis. In lorem nisi, pretium sit amet vestibulum sed, tempus et sem. Proin non ante turpis. Nulla imperdiet fringilla convallis. Vivamus vel bibendum nisl. Pellentesque justo lectus, molestie vel luctus sed, lobortis in libero. Nulla facilisi. Aliquam erat volutpat. Suspendisse vitae nunc nunc. Sed aliquet est suscipit sapien rhoncus non adipiscing nibh consequat. Aliquam metus urna, faucibus eu vulputate non, luctus eu justo.
+
+
+\section{Erweiterungen}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
+\subsection{Taggable-Manager}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
+\section{evtl. Bootstrap}
+
+Quisque tristique urna in lorem laoreet at laoreet quam congue. Donec dolor turpis, blandit non imperdiet aliquet, blandit et felis. In lorem nisi, pretium sit amet vestibulum sed, tempus et sem. Proin non ante turpis. Nulla imperdiet fringilla convallis. Vivamus vel bibendum nisl. Pellentesque justo lectus, molestie vel luctus sed, lobortis in libero. Nulla facilisi. Aliquam erat volutpat. Suspendisse vitae nunc nunc. Sed aliquet est suscipit sapien rhoncus non adipiscing nibh consequat. Aliquam metus urna, faucibus eu vulputate non, luctus eu justo.
\ No newline at end of file
diff --git a/doc/graduate-thesis/Chapters/Chapter3.log b/doc/graduate-thesis/Chapters/Chapter3.log
new file mode 100644
index 0000000..e69de29
diff --git a/doc/graduate-thesis/Chapters/Chapter3.tex b/doc/graduate-thesis/Chapters/Chapter3.tex
new file mode 100644
index 0000000..0aa7ca7
--- /dev/null
+++ b/doc/graduate-thesis/Chapters/Chapter3.tex
@@ -0,0 +1,35 @@
+\chapter{Prototyp}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at pulvinar nisi. Phasellus hendrerit, diam placerat interdum iaculis, mauris justo cursus risus, in viverra purus eros at ligula. Ut metus justo, consequat a tristique posuere, laoreet nec nibh. Etiam et scelerisque mauris. Phasellus vel massa magna. Ut non neque id tortor pharetra bibendum vitae sit amet nisi. Duis nec quam quam, sed euismod justo. Pellentesque eu tellus vitae ante tempus malesuada. Nunc accumsan, quam in congue consequat, lectus lectus dapibus erat, id aliquet urna neque at massa. Nulla facilisi. Morbi ullamcorper eleifend posuere. Donec libero leo, faucibus nec bibendum at, mattis et urna. Proin consectetur, nunc ut imperdiet lobortis, magna neque tincidunt lectus, id iaculis nisi justo id nibh. Pellentesque vel sem in erat vulputate faucibus molestie ut lorem.
+
+
+\section{Organisation}
+
+Quisque tristique urna in lorem laoreet at laoreet quam congue. Donec dolor turpis, blandit non imperdiet aliquet, blandit et felis. In lorem nisi, pretium sit amet vestibulum sed, tempus et sem. Proin non ante turpis. Nulla imperdiet fringilla convallis. Vivamus vel bibendum nisl. Pellentesque justo lectus, molestie vel luctus sed, lobortis in libero. Nulla facilisi. Aliquam erat volutpat. Suspendisse vitae nunc nunc. Sed aliquet est suscipit sapien rhoncus non adipiscing nibh consequat. Aliquam metus urna, faucibus eu vulputate non, luctus eu justo.
+
+\subsection{Verwaltung im Administrator-Backend}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
+\subsection{Berechtigungen der User}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
+
+
+\section{Funktionen}
+
+Quisque tristique urna in lorem laoreet at laoreet quam congue. Donec dolor turpis, blandit non imperdiet aliquet, blandit et felis. In lorem nisi, pretium sit amet vestibulum sed, tempus et sem. Proin non ante turpis. Nulla imperdiet fringilla convallis. Vivamus vel bibendum nisl. Pellentesque justo lectus, molestie vel luctus sed, lobortis in libero. Nulla facilisi. Aliquam erat volutpat. Suspendisse vitae nunc nunc. Sed aliquet est suscipit sapien rhoncus non adipiscing nibh consequat. Aliquam metus urna, faucibus eu vulputate non, luctus eu justo.
+
+\subsection{Abonnieren}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
+\subsection{Filtern}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
+\subsection{Benachrichtigungen}
+
+Donec urna leo, vulputate vitae porta eu, vehicula blandit libero. Phasellus eget massa et leo condimentum mollis. Nullam molestie, justo at pellentesque vulputate, sapien velit ornare diam, nec gravida lacus augue non diam. Integer mattis lacus id libero ultrices sit amet mollis neque molestie. Integer ut leo eget mi volutpat congue. Vivamus sodales, turpis id venenatis placerat, tellus purus adipiscing magna, eu aliquam nibh dolor id nibh. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed cursus convallis quam nec vehicula. Sed vulputate neque eget odio fringilla ac sodales urna feugiat.
+
diff --git a/doc/graduate-thesis/Chapters/Chapter4.log b/doc/graduate-thesis/Chapters/Chapter4.log
new file mode 100644
index 0000000..e69de29
diff --git a/doc/graduate-thesis/Chapters/Chapter4.tex b/doc/graduate-thesis/Chapters/Chapter4.tex
new file mode 100644
index 0000000..c09f501
--- /dev/null
+++ b/doc/graduate-thesis/Chapters/Chapter4.tex
@@ -0,0 +1,8 @@
+\chapter{Ergebnis}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at pulvinar nisi. Phasellus hendrerit, diam placerat interdum iaculis, mauris justo cursus risus, in viverra purus eros at ligula. Ut metus justo, consequat a tristique posuere, laoreet nec nibh. Etiam et scelerisque mauris. Phasellus vel massa magna. Ut non neque id tortor pharetra bibendum vitae sit amet nisi. Duis nec quam quam, sed euismod justo. Pellentesque eu tellus vitae ante tempus malesuada. Nunc accumsan, quam in congue consequat, lectus lectus dapibus erat, id aliquet urna neque at massa. Nulla facilisi. Morbi ullamcorper eleifend posuere. Donec libero leo, faucibus nec bibendum at, mattis et urna. Proin consectetur, nunc ut imperdiet lobortis, magna neque tincidunt lectus, id iaculis nisi justo id nibh. Pellentesque vel sem in erat vulputate faucibus molestie ut lorem.
+
+\section{Evaluierung}
+
+Quisque tristique urna in lorem laoreet at laoreet quam congue. Donec dolor turpis, blandit non imperdiet aliquet, blandit et felis. In lorem nisi, pretium sit amet vestibulum sed, tempus et sem. Proin non ante turpis. Nulla imperdiet fringilla convallis. Vivamus vel bibendum nisl. Pellentesque justo lectus, molestie vel luctus sed, lobortis in libero. Nulla facilisi. Aliquam erat volutpat. Suspendisse vitae nunc nunc. Sed aliquet est suscipit sapien rhoncus non adipiscing nibh consequat. Aliquam metus urna, faucibus eu vulputate non, luctus eu justo.
+
diff --git a/doc/graduate-thesis/Chapters/Chapter5.log b/doc/graduate-thesis/Chapters/Chapter5.log
new file mode 100644
index 0000000..e69de29
diff --git a/doc/graduate-thesis/Chapters/Chapter5.tex b/doc/graduate-thesis/Chapters/Chapter5.tex
new file mode 100644
index 0000000..9c7b287
--- /dev/null
+++ b/doc/graduate-thesis/Chapters/Chapter5.tex
@@ -0,0 +1,3 @@
+\chapter{Zusammenfassung und Ausblick}
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at pulvinar nisi. Phasellus hendrerit, diam placerat interdum iaculis, mauris justo cursus risus, in viverra purus eros at ligula. Ut metus justo, consequat a tristique posuere, laoreet nec nibh. Etiam et scelerisque mauris. Phasellus vel massa magna. Ut non neque id tortor pharetra bibendum vitae sit amet nisi. Duis nec quam quam, sed euismod justo. Pellentesque eu tellus vitae ante tempus malesuada. Nunc accumsan, quam in congue consequat, lectus lectus dapibus erat, id aliquet urna neque at massa. Nulla facilisi. Morbi ullamcorper eleifend posuere. Donec libero leo, faucibus nec bibendum at, mattis et urna. Proin consectetur, nunc ut imperdiet lobortis, magna neque tincidunt lectus, id iaculis nisi justo id nibh. Pellentesque vel sem in erat vulputate faucibus molestie ut lorem.
diff --git a/doc/graduate-thesis/Thesis.aux b/doc/graduate-thesis/Thesis.aux
index 75d3e3a..7169ecd 100644
--- a/doc/graduate-thesis/Thesis.aux
+++ b/doc/graduate-thesis/Thesis.aux
@@ -16,22 +16,46 @@
 \gdef\HyperFirstAtBeginDocument#1{#1}
 \providecommand\HyField@AuxAddToFields[1]{}
 \providecommand\HyField@AuxAddToCoFields[2]{}
-\@writefile{toc}{\contentsline {chapter}{Declaration of Authorship}{i}{dummy.1}}
-\@writefile{toc}{\vspace  {1em}}
-\@writefile{toc}{\contentsline {chapter}{Abstrakt}{ii}{dummy.2}}
-\@writefile{toc}{\vspace  {1em}}
+\catcode `"\active 
+\babel@aux{ngerman}{}
+\@writefile{toc}{\contentsline {chapter}{Declaration of Authorship}{}{dummy.1}}
+\@writefile{toc}{\contentsline {chapter}{Abstrakt}{}{dummy.2}}
+\@writefile{toc}{\vspace  {1em}\global \let \gdef empty{empty} }
 \@writefile{toc}{\contentsline {chapter}{\numberline {1}Einleitung}{1}{chapter.4}}
 \@writefile{lof}{\addvspace {10\p@ }}
 \@writefile{lot}{\addvspace {10\p@ }}
-\@writefile{toc}{\contentsline {section}{\numberline {1.1}Kapitel}{1}{section.5}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.1.1}Kapitel}{2}{subsection.6}}
-\@writefile{toc}{\contentsline {section}{\numberline {1.2}Kapitel}{2}{section.7}}
+\@writefile{toc}{\contentsline {section}{\numberline {1.1}Ausgangsituation}{1}{section.5}}
+\@writefile{toc}{\contentsline {section}{\numberline {1.2}Ziel der Arbeit}{2}{section.6}}
+\@writefile{toc}{\contentsline {chapter}{\numberline {2}Framework}{3}{chapter.7}}
+\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\addvspace {10\p@ }}
+\@writefile{toc}{\contentsline {section}{\numberline {2.1}Django}{3}{section.8}}
+\@writefile{toc}{\contentsline {section}{\numberline {2.2}Erweiterungen}{4}{section.9}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {2.2.1}Taggable-Manager}{4}{subsection.10}}
+\@writefile{toc}{\contentsline {section}{\numberline {2.3}evtl. Bootstrap}{4}{section.11}}
+\@writefile{toc}{\contentsline {chapter}{\numberline {3}Prototyp}{5}{chapter.12}}
+\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\addvspace {10\p@ }}
+\@writefile{toc}{\contentsline {section}{\numberline {3.1}Organisation}{5}{section.13}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.1.1}Verwaltung im Administrator-Backend}{6}{subsection.14}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.1.2}Berechtigungen der User}{6}{subsection.15}}
+\@writefile{toc}{\contentsline {section}{\numberline {3.2}Funktionen}{6}{section.16}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.2.1}Abonnieren}{7}{subsection.17}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.2.2}Filtern}{7}{subsection.18}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.2.3}Benachrichtigungen}{7}{subsection.19}}
+\@writefile{toc}{\contentsline {chapter}{\numberline {4}Ergebnis}{8}{chapter.20}}
+\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\addvspace {10\p@ }}
+\@writefile{toc}{\contentsline {section}{\numberline {4.1}Evaluierung}{8}{section.21}}
+\@writefile{toc}{\contentsline {chapter}{\numberline {5}Zusammenfassung und Ausblick}{9}{chapter.22}}
+\@writefile{lof}{\addvspace {10\p@ }}
+\@writefile{lot}{\addvspace {10\p@ }}
 \@writefile{toc}{\vspace  {2em}}
-\@writefile{toc}{\contentsline {chapter}{\numberline {A}Anhang}{3}{appendix.8}}
+\@writefile{toc}{\contentsline {chapter}{\numberline {A}Anhang}{10}{appendix.23}}
 \@writefile{lof}{\addvspace {10\p@ }}
 \@writefile{lot}{\addvspace {10\p@ }}
 \@writefile{toc}{\vspace  {2em}}
 \bibstyle{unsrtnat}
 \bibdata{Bibliography}
-\@writefile{toc}{\contentsline {chapter}{Bibliography}{5}{dummy.9}}
-\newlabel{Bibliography}{{3}{5}{Anhang}{dummy.9}{}}
+\@writefile{toc}{\contentsline {chapter}{Literaturverzeichnis}{12}{dummy.24}}
+\newlabel{Literaturverzeichnis}{{3}{12}{Anhang}{dummy.24}{}}
diff --git a/doc/graduate-thesis/Thesis.log b/doc/graduate-thesis/Thesis.log
index 865ccf1..086bcc7 100644
--- a/doc/graduate-thesis/Thesis.log
+++ b/doc/graduate-thesis/Thesis.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.19 (TeX Live 2018) (preloaded format=pdflatex 2018.6.7)  12 SEP 2018 12:58
+This is pdfTeX, Version 3.14159265-2.6-1.40.19 (TeX Live 2018) (preloaded format=pdflatex 2018.6.7)  19 SEP 2018 17:21
 entering extended mode
  restricted \write18 enabled.
  file:line:error style messages enabled.
@@ -451,27 +451,64 @@ Package: verbatim 2014/10/28 v1.5q LaTeX2e package for verbatim enhancements
 \every@verbatim=\toks29
 \verbatim@line=\toks30
 \verbatim@in@stream=\read1
-) (./vector.sty)
-Package hyperref Info: Option `colorlinks' set `true' on input line 13.
- (./Thesis.aux)
+) (./vector.sty) (/usr/local/texlive/2018/texmf-dist/tex/latex/titlesec/titlese
+c.sty
+Package: titlesec 2016/03/21 v2.10.2 Sectioning titles
+\ttl@box=\box31
+\beforetitleunit=\skip69
+\aftertitleunit=\skip70
+\ttl@plus=\dimen149
+\ttl@minus=\dimen150
+\ttl@toksa=\toks31
+\titlewidth=\dimen151
+\titlewidthlast=\dimen152
+\titlewidthfirst=\dimen153
+)
+(/usr/local/texlive/2018/texmf-dist/tex/generic/babel/babel.sty
+Package: babel 2018/02/14 3.18 The Babel package
+
+(/usr/local/texlive/2018/texmf-dist/tex/generic/babel/switch.def
+File: switch.def 2018/02/14 3.18 Babel switching mechanism
+)
+(/usr/local/texlive/2018/texmf-dist/tex/generic/babel-german/ngerman.ldf
+Language: ngerman 2018/03/29 v2.10 German support for babel (post-1996 orthogra
+phy)
+
+(/usr/local/texlive/2018/texmf-dist/tex/generic/babel-german/ngermanb.ldf
+Language: ngermanb 2018/03/29 v2.10 German support for babel (post-1996 orthogr
+aphy)
+
+(/usr/local/texlive/2018/texmf-dist/tex/generic/babel/babel.def
+File: babel.def 2018/02/14 3.18 Babel common definitions
+\babel@savecnt=\count133
+\U@D=\dimen154
+
+(/usr/local/texlive/2018/texmf-dist/tex/generic/babel/txtbabel.def)
+\bbl@dirlevel=\count134
+)
+Package babel Info: Making " an active character on input line 121.
+)))
+Package hyperref Info: Option `colorlinks' set `true' on input line 15.
+
+(./Thesis.aux)
 \openout1 = `Thesis.aux'.
 
-LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
-LaTeX Font Info:    Checking defaults for PU/pdf/m/n on input line 16.
-LaTeX Font Info:    ... okay on input line 16.
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
+LaTeX Font Info:    Checking defaults for PU/pdf/m/n on input line 19.
+LaTeX Font Info:    ... okay on input line 19.
 Package caption Info: Begin \AtBeginDocument code.
 Package caption Info: hyperref package is loaded.
 Package caption Info: listings package is loaded.
@@ -481,20 +518,20 @@ Package caption Info: End \AtBeginDocument code.
 
 (/usr/local/texlive/2018/texmf-dist/tex/context/base/mkii/supp-pdf.mkii
 [Loading MPS to PDF converter (version 2006.09.02).]
-\scratchcounter=\count133
-\scratchdimen=\dimen149
-\scratchbox=\box31
-\nofMPsegments=\count134
-\nofMParguments=\count135
-\everyMPshowfont=\toks31
-\MPscratchCnt=\count136
-\MPscratchDim=\dimen150
-\MPnumerator=\count137
-\makeMPintoPDFobject=\count138
-\everyMPtoPDFconversion=\toks32
+\scratchcounter=\count135
+\scratchdimen=\dimen155
+\scratchbox=\box32
+\nofMPsegments=\count136
+\nofMParguments=\count137
+\everyMPshowfont=\toks32
+\MPscratchCnt=\count138
+\MPscratchDim=\dimen156
+\MPnumerator=\count139
+\makeMPintoPDFobject=\count140
+\everyMPtoPDFconversion=\toks33
 )
-\c@lstlisting=\count139
-\AtBeginShipoutBox=\box32
+\c@lstlisting=\count141
+\AtBeginShipoutBox=\box33
  (/usr/local/texlive/2018/texmf-dist/tex/latex/graphics/color.sty
 Package: color 2016/07/10 v1.1e Standard LaTeX Color (DPC)
 
@@ -503,7 +540,7 @@ File: color.cfg 2016/01/02 v1.6 sample color configuration
 )
 Package color Info: Driver file: pdftex.def on input line 147.
 )
-Package hyperref Info: Link coloring ON on input line 16.
+Package hyperref Info: Link coloring ON on input line 19.
 
 (/usr/local/texlive/2018/texmf-dist/tex/latex/hyperref/nameref.sty
 Package: nameref 2016/05/21 v2.44 Cross-referencing by name of section
@@ -511,11 +548,11 @@ Package: nameref 2016/05/21 v2.44 Cross-referencing by name of section
 (/usr/local/texlive/2018/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
 Package: gettitlestring 2016/05/16 v1.5 Cleanup title references (HO)
 )
-\c@section@level=\count140
+\c@section@level=\count142
 )
-LaTeX Info: Redefining \ref on input line 16.
-LaTeX Info: Redefining \pageref on input line 16.
-LaTeX Info: Redefining \nameref on input line 16.
+LaTeX Info: Redefining \ref on input line 19.
+LaTeX Info: Redefining \pageref on input line 19.
+LaTeX Info: Redefining \nameref on input line 19.
 
 (./Thesis.out) (./Thesis.out)
 \@outlinefile=\write3
@@ -528,21 +565,20 @@ LaTeX Info: Redefining \nameref on input line 16.
 [1
 
 
-
 {/usr/local/texlive/2018/texmf-var/fonts/map/pdftex/updmap/pdftex.map}]
 ------------------------------------------------------------------------------
  Declaration of Authorship
 ------------------------------------------------------------------------------
-LaTeX Font Info:    Try loading font information for U+msa on input line 72.
+LaTeX Font Info:    Try loading font information for U+msa on input line 74.
 (/usr/local/texlive/2018/texmf-dist/tex/latex/amsfonts/umsa.fd
 File: umsa.fd 2013/01/14 v3.01 AMS symbols A
 )
-LaTeX Font Info:    Try loading font information for U+msb on input line 72.
+LaTeX Font Info:    Try loading font information for U+msb on input line 74.
 
 (/usr/local/texlive/2018/texmf-dist/tex/latex/amsfonts/umsb.fd
 File: umsb.fd 2013/01/14 v3.01 AMS symbols B
 )
-Underfull \hbox (badness 10000) in paragraph at lines 72--72
+Underfull \hbox (badness 10000) in paragraph at lines 74--74
 
  []
 
@@ -566,60 +602,90 @@ Underfull \hbox (badness 10000) in paragraph at lines 72--72
 
 
 ] (./Chapters/Chapter1.tex
-Chapter 1.
+Kapitel 1.
 ------------------------------------------------------------------------------
  1 Einleitung
 ------------------------------------------------------------------------------
-[1
+) [1
 
 
 
-]) (./Appendices/AppendixA.tex [2]
-Appendix A.
+] (./Chapters/Chapter2.tex [2]
+Kapitel 2.
 ------------------------------------------------------------------------------
- A Anhang
+ 2 Framework
 ------------------------------------------------------------------------------
 [3
 
-]) [4]
+]) (./Chapters/Chapter3.tex [4]
+Kapitel 3.
 ------------------------------------------------------------------------------
- Bibliography
+ 3 Prototyp
+------------------------------------------------------------------------------
+[5
+
+] [6]) (./Chapters/Chapter4.tex [7]
+Kapitel 4.
+------------------------------------------------------------------------------
+ 4 Ergebnis
+------------------------------------------------------------------------------
+) (./Chapters/Chapter5.tex [8
+
+]
+Kapitel 5.
+------------------------------------------------------------------------------
+ 5 Zusammenfassung und Ausblick
+------------------------------------------------------------------------------
+) (./Appendices/AppendixA.tex [9
+
+]
+Anhang A.
+------------------------------------------------------------------------------
+ A Anhang
+------------------------------------------------------------------------------
+[10
+
+]) [11]
+------------------------------------------------------------------------------
+ Literaturverzeichnis
 ------------------------------------------------------------------------------
 (./Thesis.bbl
 
 Package natbib Warning: Empty `thebibliography' environment on input line 8.
 
 )
-Package atveryend Info: Empty hook `BeforeClearDocument' on input line 139.
- [5
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 140.
+ [12
 
 
 ]
-Package atveryend Info: Empty hook `AfterLastShipout' on input line 139.
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 140.
  (./Thesis.aux)
-Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 139.
-Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 139.
+Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 140.
+Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 140.
 Package rerunfilecheck Info: File `Thesis.out' has not changed.
-(rerunfilecheck)             Checksum: F8FBEA24F8A9A024B852ACB04E009769;890.
-Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 139.
- ) 
+(rerunfilecheck)             Checksum: E4638A2E11D08703418A52CA0BB6D952;3303.
+Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 140.
+ )
+(\end occurred when \iftrue on line 81 was incomplete)
+(\end occurred when \iftrue on line 81 was incomplete) 
 Here is how much of TeX's memory you used:
- 12763 strings out of 492649
- 180507 string characters out of 6129623
- 253798 words of memory out of 5000000
- 16463 multiletter control sequences out of 15000+600000
+ 13593 strings out of 492649
+ 191770 string characters out of 6129623
+ 279469 words of memory out of 5000000
+ 17233 multiletter control sequences out of 15000+600000
  11401 words of font info for 43 fonts, out of 8000000 for 9000
  1141 hyphenation exceptions out of 8191
- 49i,11n,45p,13210b,389s stack positions out of 5000i,500n,10000p,200000b,80000s
-</usr/local/texlive/2018/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb
-></usr/local/texlive/2018/texmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb><
-/usr/local/texlive/2018/texmf-dist/fonts/type1/public/amsfonts/cm/cmti12.pfb></
-usr/local/texlive/2018/texmf-dist/fonts/type1/public/amsfonts/symbols/msam7.pfb
->
-Output written on Thesis.pdf (9 pages, 59930 bytes).
+ 49i,11n,45p,13210b,414s stack positions out of 5000i,500n,10000p,200000b,80000s
+</usr/local/texlive/2018/
+texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/local/texlive/2018/t
+exmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb></usr/local/texlive/2018/tex
+mf-dist/fonts/type1/public/amsfonts/cm/cmti12.pfb></usr/local/texlive/2018/texm
+f-dist/fonts/type1/public/amsfonts/symbols/msam7.pfb>
+Output written on Thesis.pdf (16 pages, 73895 bytes).
 PDF statistics:
- 113 PDF objects out of 1000 (max. 8388607)
- 97 compressed objects within 1 object stream
- 20 named destinations out of 1000 (max. 500000)
- 65 words of extra memory for PDF output out of 10000 (max. 10000000)
+ 223 PDF objects out of 1000 (max. 8388607)
+ 199 compressed objects within 2 object streams
+ 42 named destinations out of 1000 (max. 500000)
+ 185 words of extra memory for PDF output out of 10000 (max. 10000000)
 
diff --git a/doc/graduate-thesis/Thesis.out b/doc/graduate-thesis/Thesis.out
index 85986a1..70f2720 100644
--- a/doc/graduate-thesis/Thesis.out
+++ b/doc/graduate-thesis/Thesis.out
@@ -1,8 +1,23 @@
 \BOOKMARK [0][-]{dummy.1}{\376\377\000D\000e\000c\000l\000a\000r\000a\000t\000i\000o\000n\000\040\000o\000f\000\040\000A\000u\000t\000h\000o\000r\000s\000h\000i\000p}{}% 1
 \BOOKMARK [0][-]{dummy.2}{\376\377\000A\000b\000s\000t\000r\000a\000k\000t}{}% 2
 \BOOKMARK [0][-]{chapter.4}{\376\377\0001\000\040\000E\000i\000n\000l\000e\000i\000t\000u\000n\000g}{}% 3
-\BOOKMARK [1][-]{section.5}{\376\377\0001\000.\0001\000\040\000K\000a\000p\000i\000t\000e\000l}{chapter.4}% 4
-\BOOKMARK [2][-]{subsection.6}{\376\377\0001\000.\0001\000.\0001\000\040\000K\000a\000p\000i\000t\000e\000l}{section.5}% 5
-\BOOKMARK [1][-]{section.7}{\376\377\0001\000.\0002\000\040\000K\000a\000p\000i\000t\000e\000l}{chapter.4}% 6
-\BOOKMARK [0][-]{appendix.8}{\376\377\000A\000\040\000A\000n\000h\000a\000n\000g}{}% 7
-\BOOKMARK [0][-]{dummy.9}{\376\377\000B\000i\000b\000l\000i\000o\000g\000r\000a\000p\000h\000y}{}% 8
+\BOOKMARK [1][-]{section.5}{\376\377\0001\000.\0001\000\040\000A\000u\000s\000g\000a\000n\000g\000s\000i\000t\000u\000a\000t\000i\000o\000n}{chapter.4}% 4
+\BOOKMARK [1][-]{section.6}{\376\377\0001\000.\0002\000\040\000Z\000i\000e\000l\000\040\000d\000e\000r\000\040\000A\000r\000b\000e\000i\000t}{chapter.4}% 5
+\BOOKMARK [0][-]{chapter.7}{\376\377\0002\000\040\000F\000r\000a\000m\000e\000w\000o\000r\000k}{}% 6
+\BOOKMARK [1][-]{section.8}{\376\377\0002\000.\0001\000\040\000D\000j\000a\000n\000g\000o}{chapter.7}% 7
+\BOOKMARK [1][-]{section.9}{\376\377\0002\000.\0002\000\040\000E\000r\000w\000e\000i\000t\000e\000r\000u\000n\000g\000e\000n}{chapter.7}% 8
+\BOOKMARK [2][-]{subsection.10}{\376\377\0002\000.\0002\000.\0001\000\040\000T\000a\000g\000g\000a\000b\000l\000e\000-\000M\000a\000n\000a\000g\000e\000r}{section.9}% 9
+\BOOKMARK [1][-]{section.11}{\376\377\0002\000.\0003\000\040\000e\000v\000t\000l\000.\000\040\000B\000o\000o\000t\000s\000t\000r\000a\000p}{chapter.7}% 10
+\BOOKMARK [0][-]{chapter.12}{\376\377\0003\000\040\000P\000r\000o\000t\000o\000t\000y\000p}{}% 11
+\BOOKMARK [1][-]{section.13}{\376\377\0003\000.\0001\000\040\000O\000r\000g\000a\000n\000i\000s\000a\000t\000i\000o\000n}{chapter.12}% 12
+\BOOKMARK [2][-]{subsection.14}{\376\377\0003\000.\0001\000.\0001\000\040\000V\000e\000r\000w\000a\000l\000t\000u\000n\000g\000\040\000i\000m\000\040\000A\000d\000m\000i\000n\000i\000s\000t\000r\000a\000t\000o\000r\000-\000B\000a\000c\000k\000e\000n\000d}{section.13}% 13
+\BOOKMARK [2][-]{subsection.15}{\376\377\0003\000.\0001\000.\0002\000\040\000B\000e\000r\000e\000c\000h\000t\000i\000g\000u\000n\000g\000e\000n\000\040\000d\000e\000r\000\040\000U\000s\000e\000r}{section.13}% 14
+\BOOKMARK [1][-]{section.16}{\376\377\0003\000.\0002\000\040\000F\000u\000n\000k\000t\000i\000o\000n\000e\000n}{chapter.12}% 15
+\BOOKMARK [2][-]{subsection.17}{\376\377\0003\000.\0002\000.\0001\000\040\000A\000b\000o\000n\000n\000i\000e\000r\000e\000n}{section.16}% 16
+\BOOKMARK [2][-]{subsection.18}{\376\377\0003\000.\0002\000.\0002\000\040\000F\000i\000l\000t\000e\000r\000n}{section.16}% 17
+\BOOKMARK [2][-]{subsection.19}{\376\377\0003\000.\0002\000.\0003\000\040\000B\000e\000n\000a\000c\000h\000r\000i\000c\000h\000t\000i\000g\000u\000n\000g\000e\000n}{section.16}% 18
+\BOOKMARK [0][-]{chapter.20}{\376\377\0004\000\040\000E\000r\000g\000e\000b\000n\000i\000s}{}% 19
+\BOOKMARK [1][-]{section.21}{\376\377\0004\000.\0001\000\040\000E\000v\000a\000l\000u\000i\000e\000r\000u\000n\000g}{chapter.20}% 20
+\BOOKMARK [0][-]{chapter.22}{\376\377\0005\000\040\000Z\000u\000s\000a\000m\000m\000e\000n\000f\000a\000s\000s\000u\000n\000g\000\040\000u\000n\000d\000\040\000A\000u\000s\000b\000l\000i\000c\000k}{}% 21
+\BOOKMARK [0][-]{appendix.23}{\376\377\000A\000\040\000A\000n\000h\000a\000n\000g}{}% 22
+\BOOKMARK [0][-]{dummy.24}{\376\377\000L\000i\000t\000e\000r\000a\000t\000u\000r\000v\000e\000r\000z\000e\000i\000c\000h\000n\000i\000s}{}% 23
diff --git a/doc/graduate-thesis/Thesis.pdf b/doc/graduate-thesis/Thesis.pdf
index f29e1c6..09ba2fd 100644
Binary files a/doc/graduate-thesis/Thesis.pdf and b/doc/graduate-thesis/Thesis.pdf differ
diff --git a/doc/graduate-thesis/Thesis.synctex.gz b/doc/graduate-thesis/Thesis.synctex.gz
index 5e1506d..531b17b 100644
Binary files a/doc/graduate-thesis/Thesis.synctex.gz and b/doc/graduate-thesis/Thesis.synctex.gz differ
diff --git a/doc/graduate-thesis/Thesis.tex b/doc/graduate-thesis/Thesis.tex
index d31ce73..215e14d 100644
--- a/doc/graduate-thesis/Thesis.tex
+++ b/doc/graduate-thesis/Thesis.tex
@@ -10,11 +10,13 @@
 \usepackage[square, numbers, comma, sort&compress]{natbib}  % Use the "Natbib" style for the references in the Bibliography
 \usepackage{verbatim}  % Needed for the "comment" environment to make LaTeX comments
 \usepackage{vector}  % Allows "\bvec{}" and "\buvec{}" for "blackboard" style bold vectors in maths
+\usepackage{titlesec}
+\usepackage[ngerman]{babel}
 \hypersetup{urlcolor=black, colorlinks=true} 
-
+ \titleformat{\chapter}[display]
+  {\normalfont\bfseries}{}{0pt}{\Huge}
 %% ----------------------------------------------------------------
 \begin{document}
-\frontmatter      % Begin Roman style (i, ii, iii, iv...) page numbering
 
 % Set up the Title Page
 \title  {Entwicklung einer internen Social Media Plattform mit personalisierbarem Dashboard für 
@@ -38,13 +40,13 @@ Studierende}
 \rhead{\thepage}  % Sets the right side header to show the page number
 \lhead{}  % Clears the left side page header
 
-\pagestyle{fancy}  % Finally, use the "fancy" page style to implement the FancyHdr headers
 
 %% ----------------------------------------------------------------
 % Declaration Page required for the Thesis, your institution may give you a different text to place here
 \Declaration{
+\pagenumbering{gobble}
 
-\addtocontents{toc}{\vspace{1em}}  % Add a gap in the Contents, for aesthetics
+%\addtocontents{toc}{\vspace{1em}}  % Add a gap in the Contents, for aesthetics
 
 I, AUTHOR NAME, declare that this thesis titled, `THESIS TITLE' and the work presented in it are my own. I confirm that:
 
@@ -75,7 +77,8 @@ Date:\\
 % The Abstract Page
 \addtotoc{Abstrakt}  % Add the "Abstract" page entry to the Contents
 \abstract{
-\addtocontents{toc}{\vspace{1em}}  % Add a gap in the Contents, for aesthetics
+\addtocontents{toc}{\vspace{1em}\thispagestyle{empty} %deletes page numbers on the first three pages, also in the table of content
+}  % Add a gap in the Contents, for aesthetics
 
 Kurzer Überblick über die Bachelor-Arbeit\ldots
 
@@ -95,24 +98,21 @@ Kurzer Überblick über die Bachelor-Arbeit\ldots
 
 %% ----------------------------------------------------------------
 \mainmatter	  % Begin normal, numeric (1,2,3...) page numbering
-\pagestyle{fancy}  % Return the page headers back to the "fancy" style
+%\pagestyle{fancy}  % Return the page headers back to the "fancy" style
 
 % Include the chapters of the thesis, as separate files
 % Just uncomment the lines as you write the chapters
 
-\input{Chapters/Chapter1} % Introduction
+\input{Chapters/Chapter1} % Einleitung
 
-%\input{Chapters/Chapter2} % Background Theory 
+\input{Chapters/Chapter2} % Frameworks
 
-%\input{Chapters/Chapter3} % Experimental Setup
+\input{Chapters/Chapter3} % Prototyp
 
-%\input{Chapters/Chapter4} % Experiment 1
+\input{Chapters/Chapter4} % Test oder Beweis
 
-%\input{Chapters/Chapter5} % Experiment 2
+\input{Chapters/Chapter5} % Zusammenfassung und Ausblick
 
-%\input{Chapters/Chapter6} % Results and Discussion
-
-%\input{Chapters/Chapter7} % Conclusion
 
 %% ----------------------------------------------------------------
 % Now begin the Appendices, including them as separate files
@@ -131,8 +131,9 @@ Kurzer Überblick über die Bachelor-Arbeit\ldots
 \backmatter
 
 %% ----------------------------------------------------------------
-\label{Bibliography}
-\lhead{\emph{Bibliography}}  % Change the left side page header to "Bibliography"
+\renewcommand\refname{Literaturverzeichnis}
+\label{Literaturverzeichnis}
+\lhead{\emph{Literaturverzeichnis}}  % Change the left side page header to "Bibliography"
 \bibliographystyle{unsrtnat}  % Use the "unsrtnat" BibTeX style for formatting the Bibliography
 \bibliography{Bibliography}  % The references (bibliography) information are stored in the file named "Bibliography.bib"
 
diff --git a/doc/graduate-thesis/Thesis.toc b/doc/graduate-thesis/Thesis.toc
index 14bec35..1c4d8ef 100644
--- a/doc/graduate-thesis/Thesis.toc
+++ b/doc/graduate-thesis/Thesis.toc
@@ -1,12 +1,27 @@
-\contentsline {chapter}{Declaration of Authorship}{i}{dummy.1}
-\vspace {1em}
-\contentsline {chapter}{Abstrakt}{ii}{dummy.2}
-\vspace {1em}
+\babel@toc {ngerman}{}
+\contentsline {chapter}{Declaration of Authorship}{}{dummy.1}
+\contentsline {chapter}{Abstrakt}{}{dummy.2}
+\vspace {1em}\global \let \gdef empty{empty} 
 \contentsline {chapter}{\numberline {1}Einleitung}{1}{chapter.4}
-\contentsline {section}{\numberline {1.1}Kapitel}{1}{section.5}
-\contentsline {subsection}{\numberline {1.1.1}Kapitel}{2}{subsection.6}
-\contentsline {section}{\numberline {1.2}Kapitel}{2}{section.7}
+\contentsline {section}{\numberline {1.1}Ausgangsituation}{1}{section.5}
+\contentsline {section}{\numberline {1.2}Ziel der Arbeit}{2}{section.6}
+\contentsline {chapter}{\numberline {2}Framework}{3}{chapter.7}
+\contentsline {section}{\numberline {2.1}Django}{3}{section.8}
+\contentsline {section}{\numberline {2.2}Erweiterungen}{4}{section.9}
+\contentsline {subsection}{\numberline {2.2.1}Taggable-Manager}{4}{subsection.10}
+\contentsline {section}{\numberline {2.3}evtl. Bootstrap}{4}{section.11}
+\contentsline {chapter}{\numberline {3}Prototyp}{5}{chapter.12}
+\contentsline {section}{\numberline {3.1}Organisation}{5}{section.13}
+\contentsline {subsection}{\numberline {3.1.1}Verwaltung im Administrator-Backend}{6}{subsection.14}
+\contentsline {subsection}{\numberline {3.1.2}Berechtigungen der User}{6}{subsection.15}
+\contentsline {section}{\numberline {3.2}Funktionen}{6}{section.16}
+\contentsline {subsection}{\numberline {3.2.1}Abonnieren}{7}{subsection.17}
+\contentsline {subsection}{\numberline {3.2.2}Filtern}{7}{subsection.18}
+\contentsline {subsection}{\numberline {3.2.3}Benachrichtigungen}{7}{subsection.19}
+\contentsline {chapter}{\numberline {4}Ergebnis}{8}{chapter.20}
+\contentsline {section}{\numberline {4.1}Evaluierung}{8}{section.21}
+\contentsline {chapter}{\numberline {5}Zusammenfassung und Ausblick}{9}{chapter.22}
 \vspace {2em}
-\contentsline {chapter}{\numberline {A}Anhang}{3}{appendix.8}
+\contentsline {chapter}{\numberline {A}Anhang}{10}{appendix.23}
 \vspace {2em}
-\contentsline {chapter}{Bibliography}{5}{dummy.9}
+\contentsline {chapter}{Literaturverzeichnis}{12}{dummy.24}