diff --git a/django/templates/library/detail_quiz.html b/django/templates/library/detail_quiz.html
index 17afbc8..f62d2bb 100644
--- a/django/templates/library/detail_quiz.html
+++ b/django/templates/library/detail_quiz.html
@@ -34,7 +34,8 @@
                   </svg>
                   Quiz kopieren
                 </a>
-              
+            
+                {% if quiz.questions.count != 0 %}
                 <a href="{% url 'play:create_game' quiz.id %}"
                    class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white text-sm font-medium rounded-lg hover:bg-blue-700 transition-colors duration-200">
                   <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -44,7 +45,8 @@
                       d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
                   </svg>
                   Spielen
-                </a>
+                </a>           
+                {% endif %}
               </div>
             </div>
           
diff --git a/django/templates/library/overview_quiz.html b/django/templates/library/overview_quiz.html
index 4c27130..97ca65a 100644
--- a/django/templates/library/overview_quiz.html
+++ b/django/templates/library/overview_quiz.html
@@ -53,15 +53,15 @@
     <div class="bg-white rounded-xl shadow-lg p-6 border border-gray-200">
         <form method="get" class="grid grid-cols-1 md:grid-cols-3 gap-6">
             <div class="space-y-2">
-                <label class="block text-sm font-medium text-gray-700">Minimale Fragen</label>
+                <label class="block text-sm font-medium text-gray-700">minimale Anzahl an Fragen</label>
                 {{ form.min_amout_questions }}
             </div>
             <div class="space-y-2">
-                <label class="block text-sm font-medium text-gray-700">Maximale Fragen</label>
+                <label class="block text-sm font-medium text-gray-700">maximale Anzahl an Fragen</label>
                 {{ form.max_amout_questions }}
             </div>
             <div class="space-y-2">
-                <label class="block text-sm font-medium text-gray-700">Von User</label>
+                <label class="block text-sm font-medium text-gray-700">veröffentlicht von User</label>
                 {{ form.user }}
             </div>
             <div class="md:col-span-3 flex justify-end">
@@ -193,6 +193,7 @@
 
           <!-- Action Buttons -->
           <div class="flex justify-between items-center gap-2 mt-3 border-t pt-3">
+            {% if quiz.questions.count != 0 %}
             <a href="{% url 'play:create_game' quiz.id %}" 
                class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-sm font-medium rounded-lg transition-colors duration-200 flex items-center gap-2">
               <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -201,6 +202,9 @@
               </svg>
               Spielen
             </a>
+            {% else %}
+            Fürs Spielen ist min. 1 Frage nötig!
+            {% endif %}
             <div class="flex gap-1">
               <a href="{% url 'library:detail_quiz' quiz.id %}" 
                  class="p-1.5 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-lg transition-colors duration-200">
@@ -377,6 +381,7 @@
 
           <!-- Action Buttons -->
           <div class="flex justify-between items-center gap-2 mt-3 border-t pt-3">
+            {% if quiz.questions.count != 0 %}
             <a href="{% url 'play:create_game' quiz.id %}" 
                class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-sm font-medium rounded-lg transition-colors duration-200 flex items-center gap-2">
               <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -385,6 +390,10 @@
               </svg>
               Spielen
             </a>
+            {% else %}
+           Fürs Spielen ist min. 1 Frage nötig!
+            {% endif %}
+
             <div class="flex gap-1">
               <a href="{% url 'library:detail_quiz' quiz.id %}" 
                  class="p-1.5 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-lg transition-colors duration-200">
@@ -565,6 +574,7 @@
 
           <!-- Action Buttons -->
           <div class="flex justify-between items-center gap-2 mt-3 border-t pt-3">
+            {% if quiz.questions.count != 0 %}
             <a href="{% url 'play:create_game' quiz.id %}" 
                class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-sm font-medium rounded-lg transition-colors duration-200 flex items-center gap-2">
               <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -573,6 +583,9 @@
               </svg>
               Spielen
             </a>
+            {% else %}
+            Fürs Spielen ist min. 1 Frage nötig!
+            {% endif %}
             <div class="flex gap-1">
               <a href="{% url 'library:detail_quiz' quiz.id %}" 
                  class="p-1.5 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-lg transition-colors duration-200">