diff --git a/django/library/views.py b/django/library/views.py
index 99a81e7..89447b9 100644
--- a/django/library/views.py
+++ b/django/library/views.py
@@ -8,11 +8,16 @@ from .forms import QuizForm, QuestionForm
 import json
 from django.core.paginator import Paginator
 # Übersicht aller Quizze
-@login_required
+
 def overview_quiz(request):
-    quizzes = QivipQuiz.objects.filter(user_id=request.user)
-    all_quizzes = QivipQuiz.objects.filter(status='öffentlich').exclude(user_id=request.user).filter(question__isnull=False).distinct()
-    return render(request, 'library/overview_quiz.html', {'quizzes': quizzes, 'all_quizzes': all_quizzes})
+    try:
+        quizzes = QivipQuiz.objects.filter(user_id=request.user)
+        all_quizzes = QivipQuiz.objects.filter(status='öffentlich').exclude(user_id=request.user).filter(question__isnull=False).distinct()
+        return render(request, 'library/overview_quiz.html', {'quizzes': quizzes, 'all_quizzes': all_quizzes})
+
+    except:
+        all_quizzes = QivipQuiz.objects.filter(status='öffentlich').filter(question__isnull=False).distinct()
+        return render(request, 'library/overview_quiz.html', {'quizzes': None, 'all_quizzes': all_quizzes})
 
 # Neues Quiz erstellen
 @login_required
diff --git a/django/templates/homepage/home.html b/django/templates/homepage/home.html
index 56a0e19..643933d 100644
--- a/django/templates/homepage/home.html
+++ b/django/templates/homepage/home.html
@@ -9,7 +9,7 @@
     <div class="grid sm:grid-cols-3 place-items-stretch text-center mt-8 gap-4 p-4 border-3 bg-blue-100 border-blue-100 rounded-md">
         <a class="qp-a-button bg-green-500 text-white" href="{% url 'play:join_game' %}">Teilnehmen</a>
         <a class="qp-a-button bg-indigo-500 text-white" href="#">Moderieren</a>
-        <a class="qp-a-button bg-purple-500 text-white" href="#">Verwalten</a>
+        <a class="qp-a-button bg-purple-500 text-white" href="{% url 'library:new_quiz' %}">Erstellen</a>
     </div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/django/templates/library/overview_quiz.html b/django/templates/library/overview_quiz.html
index a7fae4a..80bb3b6 100644
--- a/django/templates/library/overview_quiz.html
+++ b/django/templates/library/overview_quiz.html
@@ -4,6 +4,7 @@
 <div class="flex justify-end mr-2">
     <a href="{% url 'library:new_quiz' %}" class="mt-2 p-2 shadow-md border-blue-600 border-2 rounded-md text-black mb-12">Neues Quiz erstellen</a>
 </div>
+{% if quizzes %}
 <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 px-4 place-items-center">    
     <h1 class="font-bold mb-4 px-4 bg-blue-100">meine eigenen Quiz</h1></div>
 <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 px-4 place-items-center">
@@ -28,6 +29,7 @@
     </div>
 
     {% endfor %}
+    {% endif %}
 </div>
     
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 px-4 place-items-center">