diff --git a/templates/base.html b/templates/base.html
index cda9bc94888050dd13e5443c94f40b3279176c42..65e83961a507dff55d92e1099f6ce1a43050db36 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -65,7 +65,7 @@
 
 						<li class="col-xs-12 col-sm-4 pull-right">
 							<form action="{{ url_for('search') }}" role="search">
-								<div class="input-group">
+								<div class="input-group" style="margin-top: 3px">
 									<input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}" width="100px">
 									<span class="input-group-btn"><button class="btn btn-secondary" type="submit"><span class="glyphicon glyphicon-search"></span> </button></span>
 								</div>
diff --git a/templates/faq.html b/templates/faq.html
index aabe74ee0b9b0dbd2050f9f0a32781e37da752ba..022aab0780b618fe472641e03719f77fe105cbb8 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -11,9 +11,11 @@
 	<div class="faqHeader">Allgemein</div>
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h4 class="panel-title">
-				<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#speed">Der Download ist zu langsam.</a>
-			</h4>
+			<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#speed">
+				<h4 class="panel-title">
+					Der Download ist zu langsam.
+				</h4>
+			</a>
 		</div>
 		<div id="speed" class="panel-collapse collapse in">
 			<div class="panel-body">
@@ -26,9 +28,11 @@
 				<div class="faqHeader">Abspielprobleme</div>
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h4 class="panel-title">
-				<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#playbackfile">Ich kann ein heruntergeladenes Video nicht abspielen.</a>
-			</h4>
+			<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#playbackfile">
+				<h4 class="panel-title">
+				Ich kann ein heruntergeladenes Video nicht abspielen.
+				</h4>
+			</a>
 		</div>
 		<div id="playbackfile" class="panel-collapse collapse in auto-collapse">
 			<div class="panel-body">
@@ -39,9 +43,11 @@
 				<div class="faqHeader">Technisches</div>
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h4 class="panel-title">
-				<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#encoding">Wie encoded ihr eurere Videos?</a>
-			</h4>
+			<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#encoding">
+				<h4 class="panel-title">
+					Wie encoded ihr eurere Videos?
+				</h4>
+			</a>
 		</div>
 		<div id="encoding" class="panel-collapse collapse in auto-collapse">
 			<div class="panel-body">