diff --git a/capsule-prototype/index.html b/capsule-prototype/index.html
index 7465951c29cf37fd2d882aff48fe71f7e1bc95e7..8ebcbc3a42e0f313495ca5af023a48441b34b8f5 100644
--- a/capsule-prototype/index.html
+++ b/capsule-prototype/index.html
@@ -200,7 +200,7 @@
 
 	<div id='tabs' class='flex flex-col'>
 
-		<div id='tab_selector' class='flex-row flex-center editmode'>
+		<div id='tab_selector' class='flex-row flex-center'>
 			<form id='tab_selector_form' class='flex-row flex-space-around'>
 				<input id='inp_vid' name='tab' value='video' type='radio' checked />
 				<label for='inp_vid'>video</label>
diff --git a/capsule-prototype/js/online-script.js b/capsule-prototype/js/online-script.js
index 6cd99d64a620d5c1bac12ad9ec8924daad74bf3d..9c88df29f59f7d4e9d908b935bfa476ef959f03d 100644
--- a/capsule-prototype/js/online-script.js
+++ b/capsule-prototype/js/online-script.js
@@ -31,6 +31,11 @@ window.onload = function() {
 	rekall_common.owner = {"canEdit": false, "author": "", "locationGps": "", "locationName": ""};
 
 	rouletteStart();
+
+	$('#tab_selector_form').change(function (event) {
+		pubSub.publish(event.target.value)
+	});
+
 	var httpGetData = {"status": 1};
 	if(getParameterByName("p") != "") {
 		httpGetData.p = getParameterByName("p");
@@ -132,6 +137,7 @@ window.onload = function() {
 	});
 };
 
+
 function setEditionControls() {
 
 	//Drag&drop files
@@ -370,10 +376,6 @@ function setEditionControls() {
 		}
 	});
 
-	$('#tab_selector_form').change(function (event) {
-		pubSub.publish(event.target.value)
-	});
-
 	$("#popupEdit").click(function (event) {
 		event.stopPropagation();
 		closeInputs();
@@ -706,7 +708,9 @@ function openVideo() {
 
 function openMosaic() {
 	$('#video_tab').hide();
-	$('#left_menu_controls').hide();
+	if(rekall_common.owner.canEdit) {
+		$('#left_menu_controls').hide();
+	}
     window.app.rekall.Rekall('mosaicWidget').show();
 }