diff --git a/templates/macros.html b/templates/macros.html
index 2f205d05e6b82c034a4599fa33793c5100b4574f..cc657625e28074646785f2712976d289e4f3e17d 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -49,7 +49,7 @@
 {% endmacro %}
 
 {% macro player(lecture, videos) %}
-<script src="{{url_for('static', filename='/mediaelementjs/mediaelement-and-player.min.js')}}"></script>
+<script src="{{url_for('static', filename='mediaelementjs/mediaelement-and-player.min.js')}}"></script>
 <link rel="stylesheet" href="{{url_for('static', filename='mediaelementjs/mediaelementplayer.css')}}" />
 <video class="mejs-player" width="640" height="360" style="width: 100%; height: 100%;">
 	{% for v in videos %}
@@ -90,10 +90,12 @@
 {% endmacro %}
 
 {% macro video_download_btn(videos) %}
-<button class="btn btn-primary dropdown-toggle {% if videos|length is equalto 0 %}disabled{% endif %}" type="button" data-toggle="dropdown">Download <span class="caret"></span></button>
+<button class="btn btn-primary dropdown-toggle{% if videos|length is equalto 0 %} disabled{% endif %}" type="button" data-toggle="dropdown">Download <span class="caret"></span></button>
 <ul class="dropdown-menu">
 	{% for v in videos %}
-	{% if v.downloadable %}	<li><a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{ valuecheckbox(['videos',v.id,'visible'], v.visible) }} {{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>{% endif %}
+		{% if v.downloadable %}	
+			<li><a href="{{ config.VIDEOPREFIX }}/{{v.path}}">{{ valuecheckbox(['videos',v.id,'visible'], v.visible) }} {{v.format_description}} ({{v.file_size|filesizeformat(true)}})</a></li>
+		{% endif %}
 	{% endfor %}
 </ul>
 <noscript>
@@ -147,7 +149,7 @@ $('#embedcodebtn').popover(
 		</span>
 		<span class="col-sm-3 col-xs-12">
 			<span class="pull-right">
-				<span class="dropdown">
+				<span>
 					{{ video_download_btn(videos) }}
 				</span>
 				<a href="{{url_for('play', id=lecture.id)}}" class="btn btn-default {% if videos|length is equalto 0 %}disabled{% endif %}">
diff --git a/templates/play.html b/templates/play.html
index 59a9bc11bf4014371f3fb762c0b9debdc0ef2b45..50951de4da420cb313a947eb8fa2d930f1392341 100644
--- a/templates/play.html
+++ b/templates/play.html
@@ -10,15 +10,19 @@
 		<h1 class="panel-title"><strong>{{ course.title }}</strong>: {{ lecture.title}}</h1>
 	</div>
 	<div class="panel-body">
-		<p class="col-xs-12" style="padding: 0px;">
-			<span><a href="{{url_for('course_id', numid=course.id)}}#lecture-{{lecture.id}}" class="btn btn-default" >Zur Veranstaltungsseite</a><span>
-			<span class="pull-right">
-				<span>{{ video_embed_btn(lecture.id) }}</span>
-				<span>{{ video_download_btn(videos) }}</span>
-			</span>
-		</p>
+		<div class="row" style="padding: 0px;">
+			<div class="col-sm-6 col-xs-12" style="padding-bottom: 5px;">
+				<span>
+					<a href="{{url_for('course_id', numid=course.id)}}#lecture-{{lecture.id}}" class="btn btn-default" >Zur Veranstaltungsseite</a>
+				<span>
+			</div>
+			<div class="col-sm-6 col-xs-12">
+				<div class="pull-right" style="margin-left: 10px;">{{ video_download_btn(videos) }}</div>
+				<div class="pull-right">{{ video_embed_btn(lecture.id) }}</div>
+			</div>
+		</div>
 		<div class="row">
-			<div class="col-xs-12">
+			<div class="col-xs-12" style="padding: 0px">
 				{{ player(lecture, videos) }}
 			</div>
 		</div>