diff --git a/templates/base.html b/templates/base.html
index 79b57b60d3aa1f85a9f70f9eeaf779145ee0ab5f..3b666aa0ebd55ac869d10f79d0a14775dc18b834 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -70,7 +70,7 @@
 				</ul>
 			</div>
 			{% if ismod() %}
-			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+			<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
 				<span class="navbar-toggler-icon"></span>
 			</button>
 			{% endif %}
@@ -111,7 +111,7 @@
 							)
 						</script>
 						{% else %}
-							<button data-toggle="dropdown"class="btn dropdown-toggle">{{ session.user.givenName }} <span class="caret"></span></button>
+							<button data-toggle="dropdown" class="btn dropdown-toggle">{{ session.user.givenName }} <span class="caret"></span></button>
 							<ul class="dropdown-menu">
 								{% for n in navbar if n.userendpoint %}
 									{{ navbaricon(n, user=session.user.dbid) }}
diff --git a/templates/course.html b/templates/course.html
index 0d1890d9d9d5c5977049b980995ce17443f7a6a0..61429d0bdff883b332793fe38107fe03cd7f7475 100644
--- a/templates/course.html
+++ b/templates/course.html
@@ -22,7 +22,7 @@
 		</ul>
 	</div>
 	<div class="row card-body">
-		<div class="col-xs-12">
+		<div class="col-12">
 			<table class="table-top-aligned table-condensed">
 				<tbody>
 					{% if ismod() %}
@@ -36,7 +36,7 @@
 			</table>
 		</div>
 	{% if ismod() %}
-		<div class="col-xs-12" style="margin-top: 20px">
+		<div class="col-12" style="margin-top: 20px">
 			<table class="table-condensed table-top-aligned">
 				<tbody>
 					<tr><td>Sichtbar:</td><td>{{ moderator_checkbox(['courses',course.id,'visible'], course.visible) }}</td></tr>
@@ -67,7 +67,7 @@
 {% if ismod() %}
 <div class="card m-1">
 	<div class="card-header">
-		<a data-toggle="collapse" href="#statscard" class="plotlyresize"><h1 class="card-title">Statistiken</h1></a>
+		<a data-toggle="collapse" href="#statscard" class="plotlyresize"><span class="card-title">Statistiken</span></a>
 	</div>
 	<div class="card-body collapse out card-collapse" id="statscard">
 		<div class="row">
@@ -86,21 +86,21 @@
 
 <div class="card m-1">
 	<div class="card-header">
-		<h1 class="card-title">Videos
-			{% if ismod() %}
-				<a class="btn btn-secondary" style="margin-right: 5px;" href="{{ url_for('create', table='lectures', time=datetime.now(), title='Noch kein Titel', visible='0', course_id=course.id, ref=url_for('course', id=course.id)) }}">Neuer Termin</a>
-				<a class="btn btn-secondary" style="margin-right: 5px;" href="{{url_for('list_import_sources', id=course['id'])}}">Campus Import</a>
-			{% endif %}
-			<ul class="list-inline float-right">
-				<li class="list-inline-item">
-					<a class="fa fa-rss-square" aria-hidden="true" href="{{url_for('rss_feed', handle=course.handle)}}" style="text-decoration: none"></a>
-				</li>
-			{% if ismod() %}
-				<li class="list-inline float-right">
-					<a class="fa fa-calendar" aria-hidden="true" href="{{url_for('ical_course', course=course.handle)}}" style="text-decoration: none"></a>
-				</li>
-			{% endif %}
-		</h1>
+		<span class="card-title">Videos</span>
+		{% if ismod() %}
+			<a class="btn btn-secondary" style="margin-right: 5px;" href="{{ url_for('create', table='lectures', time=datetime.now(), title='Noch kein Titel', visible='0', course_id=course.id, ref=url_for('course', id=course.id)) }}">Neuer Termin</a>
+			<a class="btn btn-secondary" style="margin-right: 5px;" href="{{url_for('list_import_sources', id=course['id'])}}">Campus Import</a>
+		{% endif %}
+		<ul class="list-inline float-right">
+			<li class="list-inline-item">
+				<a class="fa fa-rss-square" aria-hidden="true" href="{{url_for('rss_feed', handle=course.handle)}}" style="text-decoration: none"></a>
+			</li>
+		{% if ismod() %}
+			<li class="list-inline float-right">
+				<a class="fa fa-calendar" aria-hidden="true" href="{{url_for('ical_course', course=course.handle)}}" style="text-decoration: none"></a>
+			</li>
+		{% endif %}
+		</ul>
 	</div>
 	<ul class="list-group lectureslist">
 		{% for l in lectures %}