diff --git a/frontend/index.html b/frontend/index.html
index b1ed721..c04ab17 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -38,22 +38,14 @@
 
 <div id="content">
 	<div id="plot"></div>
-	<table id="move">
-		<tr>
-			<td>
-				<input type="image" src="images/control_rewind_blue.png" value="move_back" title="Move back" />
-				<input type="image" onclick="plot" src="images/zoom_in.png" value="zoom_in" title="Zoom in" />
-			</td>
-			<td>
-				<input type="image" src="images/control_end_blue.png" value="move_last" title="Move to now" />
-				<input type="image" src="images/zoom.png" value="zoom_reset" title="Reset zoom" />
-			</td>
-			<td>
-				<input type="image" src="images/zoom_out.png" value="zoom_out" title="Zoom out" />
-				<input type="image" src="images/control_fastforward_blue.png" value="move_forward" title="Move forward" />
-			</td>
-		</tr>
-	</table>
+	<div id="controls">
+		<input type="image" src="images/control_rewind_blue.png" value="move_back" title="Move back" />
+		<input type="image" src="images/zoom_in.png" value="zoom_in" title="Zoom in" />
+		<input type="image" src="images/zoom.png" value="zoom_reset" title="Reset zoom" />
+		<input type="image" src="images/zoom_out.png" value="zoom_out" title="Zoom out" />
+		<input type="image" src="images/control_end_blue.png" value="move_last" title="Move to now" />
+		<input type="image" src="images/control_fastforward_blue.png" value="move_forward" title="Move forward" />
+	</div>
 	
 	<div id="accordion">
 		<h3><img src="images/table.png" alt="" /> Kanäle</h3>
diff --git a/frontend/javascripts/frontend.js b/frontend/javascripts/frontend.js
index ccbe302..fb2d75d 100644
--- a/frontend/javascripts/frontend.js
+++ b/frontend/javascripts/frontend.js
@@ -128,7 +128,8 @@ vz.wui.dialogs.init = function() {
  */
 vz.wui.initEvents = function() {
 	// bind plot actions
-	$('#move input[type=image]').click(vz.wui.handleControls);
+	$('#controls input[type=image]').button().click(vz.wui.handleControls);
+	$('#controls').buttonset();
 	
 	
 	$('#plot')
diff --git a/frontend/stylesheets/style.css b/frontend/stylesheets/style.css
index 15f44eb..2f79489 100644
--- a/frontend/stylesheets/style.css
+++ b/frontend/stylesheets/style.css
@@ -44,7 +44,7 @@ tbody tr td {
 	margin: 10px;
 }
 
-#move {
+#controls {
 	width: 100%;
 	text-align: center;
 	margin: 5px;