diff --git a/templates/index.html b/templates/index.html
index 8720509885e5d70a83812f99fec5ec511e299a40..3a4c359a88e84b4bfa1b4b93db824b0867dc66bd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -34,22 +34,24 @@
 			<div class="column">
 				<figure class="{{ loop.index }}">
 					{{ loop.index }}
-					<img src="{{ object.url }}" onclick="openModal();currentSlide(1)" class="hover-shadow" style="width: 350px; height: 260px; padding: 10px;">
+					<img src="{{ object.url }}" onclick="openModal();currentSlide({{ loop.index }})" class="hover-shadow" style="width: 350px; height: 260px; padding: 10px;">
 					<!-- Hovereffekt muss überarbeitet werden, IST: Beschriftung ü+berlagert sich zur Zeit -->
 					<figcaption>Künstler: {{ object.actor }} <br> Titel: {{ object.title }} </figcaption>
-					
 				</figure> 
 			</div>
+			{% endfor %}
 			<!-- ab hier kann weg - Verlinkung auf Detailseite stattdessen -->
 			<div id="myModal" class="modal">
 				<span class="close cursor" onclick="closeModal()">&times;</span>
 				<div class="modal-content">
-
+				
+					{% for object in objects %}
 					<div class="mySlides">
-						<div class="numbertext"> {{ loop.index }} / 4</div>
+						<div class="numbertext"> {{ loop.index }} </div>
 						<img src="{{ object.url }}" style="width:100%">
 					</div>
-
+					{% endfor %}
+					
 					<a class="prev" onclick="plusSlides(-1)">&#10094;</a>
 					<a class="next" onclick="plusSlides(1)">&#10095;</a>
 				
@@ -57,15 +59,17 @@
 						<p id="caption"></p>
 					</div>
 					
+					{% for object in objects %}
 					<div class="slide">
 						<div class="column">
-							<img class="demo" src="{{ object.url }}" onclick="currentSlide(1)" alt="1/4"  style="width: 300px; height: 210px; padding: 20px;">
+							<img class="demo" src="{{ object.url }}" onclick="currentSlide({{ loop.index }})" alt="1/4"  style="width: 300px; height: 210px; padding: 20px;">
 						</div>
 					</div>
+					{% endfor %}
 					
 				</div>
 			</div>
-			{% endfor %}	
+				
 		</div>
 	</div>