diff --git a/templates/jobs_overview.html b/templates/jobs_overview.html
index 1496e5f7fc57caa9821636f0c6b4b77b6dc79666..161aa6cb79f6f1a480f2e366148fc129115037b1 100644
--- a/templates/jobs_overview.html
+++ b/templates/jobs_overview.html
@@ -42,7 +42,7 @@
 			<div class="panel-body">
 				<div class="row">
 					<form>
-						<div class="form-group col-xs-3">
+						<div class="form-group col-xs-12 col-lg-4">
 							<label for="type">Type</label>
 							<input list="job_type" name="type" value="{{ filter.type }}">
 							<datalist id="job_type">
@@ -51,7 +51,7 @@
 								{% endfor %}
 							</datalist>
 						</div>
-						<div class="form-group col-xs-3">
+						<div class="form-group col-xs-12 col-lg-4">
 							<label for="worker">Worker</label>
 							<input list="job_worker" name="worker" value="{{ filter.worker }}">
 							<datalist id="job_worker">
@@ -60,7 +60,7 @@
 								{% endfor %}
 							</datalist>
 						</div>
-						<div class="form-group col-xs-3">
+						<div class="form-group col-xs-12 col-lg-4">
 							<label for="state">State</label>
 							<input list="job_state" name="state" value="{{ filter.state }}">
 							<datalist id="job_state">
@@ -69,75 +69,78 @@
 								{% endfor %}
 							</datalist>
 						</div>
-						<button type="submit" class="btn btn-primary col-xs-1">Filter</button>
+						<div class="col-xs-12">
+							<button type="submit" class="btn btn-primary">Filter</button>
+							<ul class="pagination pull-right">
+								<li class="page-item">
+									<a class="page-link" href="{{url_for('jobs_overview', page=page-1, **(request.args|filterdict(['page','pagesize']))) }}">
+										<span aria-hidden="true">&laquo;</span>
+										<span class="sr-only">Previous</span>
+									</a>
+								</li>
+								{% for i in range(max(0, page - 5) ,min(pagecount, page + 5)) %}
+									{% if i == page %}
+										<li class="page-item active"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+									{% else %}
+										<li class="page-item"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+									{% endif %}
+								{% endfor %}
+								<li class="page-item">
+									<a class="page-link" href="{{url_for('jobs_overview', page=page+1, **(request.args|filterdict(['page','pagesize']))) }}">
+										<span aria-hidden="true">&raquo;</span>
+										<span class="sr-only">Next</span>
+									</a>
+								</li>
+							</ul>
+						</div>
 					</form>
-					<ul class="pagination pull-right">
-						<li class="page-item">
-							<a class="page-link" href="{{url_for('jobs_overview', page=page-1, **(request.args|filterdict(['page','pagesize']))) }}">
-								<span aria-hidden="true">&laquo;</span>
-								<span class="sr-only">Previous</span>
-							</a>
-						</li>
-						{% for i in range(max(0, page - 5) ,min(pagecount, page + 5)) %}
-							{% if i == page %}
-								<li class="page-item active"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+				</div>
+				<div class="table-responsive">
+					<table class="table">
+						<tr>
+							<th>ID</th>
+							<th>Type</th>
+							<th>Priority</th>
+							<th>Worker</th>
+							<th>letzter Ping</th>
+							<th>State</th>
+							<th>Eingereiht am</th>
+							<th>Fertig geworden am</th>
+							<th>Gescheduled am</th>
+							<th>Daten</th>
+							<th>Status</th>
+						</tr>
+						{% for i in jobs %}
+							{% if i.last_ping %}
+								{% set td = (datetime.now()-(i.last_ping) ) %}
 							{% else %}
-								<li class="page-item"><a class="page-link" href="{{url_for('jobs_overview', page=i, **(request.args|filterdict(['page','pagesize']))) }}">{{ i }}</a></li>
+								{% set td = -1 %}
 							{% endif %}
-						{% endfor %}
-						<li class="page-item">
-							<a class="page-link" href="{{url_for('jobs_overview', page=page+1, **(request.args|filterdict(['page','pagesize']))) }}">
-								<span aria-hidden="true">&raquo;</span>
-								<span class="sr-only">Next</span>
-							</a>
-						</li>
-					</ul>
 
+							{% if (td == -1) or (i.state != "running") %}
+								<tr>
+							{% elif td < timedelta(seconds=20) %}
+								<tr class="success">
+							{% elif td < timedelta(seconds=60) %}
+								<tr class="warning">
+							{% else %}
+								<tr class="danger">
+							{% endif %}
+								<td>{{i.id}}</td>
+								<td>{{i.type}}</td>
+								<td>{{i.priority}}</td>
+								<td>{{i.worker}}</td>
+								<td>{{i.last_ping}}</td>
+								<td>{{i.state}}</td>
+								<td>{{i.time_created}}</td>
+								<td>{{i.time_finished}}</td>
+								<td>{{i.time_scheduled}}</td>
+								<td>{{i.data}}</td>
+								<td>{{i.status}}</td>
+							</tr>
+						{% endfor %}
+					</table>
 				</div>
-				<table class="table">
-				<tr>
-					<th>ID</th>
-					<th>Type</th>
-					<th>Priority</th>
-					<th>Worker</th>
-					<th>letzter Ping</th>
-					<th>State</th>
-					<th>Eingereiht am</th>
-					<th>Fertig geworden am</th>
-					<th>Gescheduled am</th>
-					<th>Daten</th>
-					<th>Status</th>
-				</tr>
-					{% for i in jobs %}
-						{% if i.last_ping %}
-							{% set td = (datetime.now()-(i.last_ping) ) %}
-						{% else %}
-							{% set td = -1 %}
-						{% endif %}
-
-						{% if (td == -1) or (i.state != "running") %}
-							<tr>
-						{% elif td < timedelta(seconds=20) %}
-							<tr class="success">
-						{% elif td < timedelta(seconds=60) %}
-							<tr class="warning">
-						{% else %}
-							<tr class="danger">
-						{% endif %}
-							<td>{{i.id}}</td>
-							<td>{{i.type}}</td>
-							<td>{{i.priority}}</td>
-							<td>{{i.worker}}</td>
-							<td>{{i.last_ping}}</td>
-							<td>{{i.state}}</td>
-							<td>{{i.time_created}}</td>
-							<td>{{i.time_finished}}</td>
-							<td>{{i.time_scheduled}}</td>
-							<td>{{i.data}}</td>
-							<td>{{i.status}}</td>
-						</tr>
-					{% endfor %}
-				</table>
 			</div>
 		</div>
 	</div>