diff --git a/server.py b/server.py
index ac6ad34ff4eaea7e1ed035b1af1c1d0d00a29cc5..a7a18259d05447e629149063ecc2d667364c6122 100755
--- a/server.py
+++ b/server.py
@@ -90,7 +90,10 @@ def videos():
 	for i in c:
 		if i['semester'] == '':
 			i['semester'] = 'zeitlos'
-	return render_template('videos.html', courses=c, groupedby=request.args.get('groupedby'))
+	groupedby = request.args.get('groupedby')
+	if groupedby not in ['title','semester','organizer']:
+		groupedby = 'semester'
+	return render_template('videos.html', courses=c, groupedby=groupedby)
 
 @app.route('/faq')
 def faq():
diff --git a/templates/search.html b/templates/search.html
index e40067819e0e5fc82b090ed91be292e2fe47b726..24974e711a85f4e521bb19ab3050b3219ea0ac74 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -1,37 +1,37 @@
 {% from 'macros.html' import preview %}
 {% extends "base.html" %}
 {% block content %}
-<div class="container">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h1>Veranstaltungen</h1>
+<div class="container-fluid">
+	<div class="col-xs-offset-1 col-xs-10">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h1>Veranstaltungen</h1>
+			</div>
+				{% if courses == [] %}
+				<div class="panel-body">Nichts gefunden!</div>
+				{% else %}
+					<ul class="list-group courselist">
+						{% for course in courses %}
+							<li class="list-group-item">{{ course['title'] }}</li>
+						{% endfor %}
+					</ul>
+				{% endif %}
 		</div>
-		<div class="panel-body">
-			{% if courses == [] %}
-				Nichts gefunden!
-			{% else %}
-				<ul class="list-group courselist">
-					{% for course in courses %}
-						<li class="list-group-item">{{ course['title'] }}</li>
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h1>Videos</h1>
+			</div>
+			<div class="panel-body">
+				{% if lectures == [] %}
+					Nichts gefunden!
+				{% else %}
+					<ul class="list-group videopreview">
+					{% for lecture in lectures %}
+						{{ preview(lecture) }}
 					{% endfor %}
-				</ul>
-			{% endif %}
-		</div>
-	</div>
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			<h1>Videos</h1>
-		</div>
-		<div class="panel-body">
-			{% if lectures == [] %}
-				Nichts gefunden!
-			{% else %}
-				<ul class="list-group videopreview">
-				{% for lecture in lectures %}
-					{{ preview(lecture) }}
-				{% endfor %}
-				</ul>
-			{% endif %}
+					</ul>
+				{% endif %}
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/videos.html b/templates/videos.html
index aa4a8b39d329650ba59092fa24dcc8978f97ac29..3c6587b35c01488f9370ca210d22fd48427a184b 100644
--- a/templates/videos.html
+++ b/templates/videos.html
@@ -1,6 +1,5 @@
 {% from 'macros.html' import course_list_item %}
 {% set active_page = 'videos' -%}
-{% set groupedby = groupedby|default('semester', true) -%}
 
 {% extends "base.html" %}
 {% block content %}
@@ -11,14 +10,13 @@
 		  <span class="caret"></span></button>
 		  <ul class="dropdown-menu">
 		    <li><a href="?groupedby=semester">Semester</a></li>
-		    <li><a href="?groupedby=courses">Veranstaltungen</a></li>
+		    <li><a href="?groupedby=title">Veranstaltungen</a></li>
 		    <li><a href="?groupedby=organizer">Dozenten</a></li>
 		  </ul>
 		</div>
 	</div>
 	<div class="row"><div class="col-xs-offset-1 col-xs-10">
-	{% if groupedby == 'semester' %}
-		{% for g in courses|groupby('semester')|reverse %}
+		{% for g in courses|groupby(groupedby)|reverse %}
 			<div class="row panel-group">
 				<div class="col-xs-12"><div class="panel panel-default">
 					<div class="panel-heading">
@@ -26,47 +24,16 @@
 					</div>
 					<ul class="courses-list list-group">
 						{% for i in g.list %}
-						{{ course_list_item(i) }}
+							{% if groupedby == semester %}
+								{{ course_list_item(i) }}
+							{% else %}
+								{{ course_list_item(i,true) }}
+							{% endif %}
 						{% endfor %}
 					</ul>
 				</div></div>
 			</div>
 		{% endfor %}
-	{% endif %}
-	
-	{% if groupedby == 'courses' %}
-		{% for g in courses|groupby('title')|reverse %}
-		<div class="row panel-group">
-			<div class="col-xs-12"><div class="panel panel-default">
-				<div class="panel-heading">
-					<h1 class="panel-title">{{g.grouper}}</h1>
-				</div>
-				<ul class="courses-list list-group">
-					{% for i in g.list|sort(attribute='semester') %}
-					{{ course_list_item(i,true) }}
-					{% endfor %}
-				</ul>
-			</div></div>
-		</div>
-		{% endfor %}
-	{% endif %}
-	
-	{% if groupedby == 'organizer' %}
-		{% for g in courses|groupby('organizer')|reverse %}
-		<div class="row panel-group">
-			<div class="col-xs-12"><div class="panel panel-default">
-				<div class="panel-heading">
-					<h1 class="panel-title">{{g.grouper}}</h1>
-				</div>
-				<ul class="courses-list list-group">
-					{% for i in g.list|sort(attribute='semester') %}
-					{{ course_list_item(i,true) }}
-					{% endfor %}
-				</ul>
-			</div></div>
-		</div>
-		{% endfor %}
-	{% endif %}
 	</div></div>
 
 </div>