diff --git a/templates/course.html b/templates/course.html
index 6b5d417fb57e8aeb176b1b8d06204aaa68eff686..306f6f20fc3a418d3995c649e1f5f2a720097578 100644
--- a/templates/course.html
+++ b/templates/course.html
@@ -10,7 +10,7 @@
 			</div>
 			<ul class="list-group lectureslist">
 				{% for l in lectures %}
-					{{ lecture_list_item(l,videos|selectattr('lecture_id','equalto',l.id)) }}
+					{{ lecture_list_item(l,videos|selectattr('lecture_id','equalto',l.id)|list) }}
 				{% endfor %}
 			</ul>
 		</div>
diff --git a/templates/macros.html b/templates/macros.html
index 77fcde8b6a2cf0c8353f5844b2cf0d85f7795a8e..758bd7b72ea2f30736526a32ab1a93652126feb5 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -97,10 +97,10 @@
 		<span class="col-xs-2">
 			{{ lecture.time }}
 		</span>
-		<span class="col-xs-4">
+		<span class="col-xs-3">
 			{{ lecture.comment|safe }}
 		</span>
-		<span class="col-xs-3">
+		<span class="col-xs-4">
 			<span class="dropdown pull-right">
 				<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">Download <span class="caret"></span></button>
 				<ul class="dropdown-menu">
@@ -108,6 +108,13 @@
 					<li><a href="https://video.fsmpi.rwth-aachen.de/{{v.path}}">{{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
 					{% endfor %}
 				</ul>
+				<noscript>
+					<ul class="pull-right list-unstyled" style="margin-left:10px;">
+						{% for v in videos %}
+						<li><a href="https://video.fsmpi.rwth-aachen.de/{{v.path}}">{{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
+						{% endfor %}
+					</ul>
+				</noscript>
 			</span>
 			<a href="/play?lectureid={{lecture.id}}" class="pull-right">
 				<button class="btn btn-default" type="button">