diff --git a/client/jsFiles/SEAWebClientCommunication.js b/client/jsFiles/SEAWebClientCommunication.js
index a331f7d..28f998c 100644
--- a/client/jsFiles/SEAWebClientCommunication.js
+++ b/client/jsFiles/SEAWebClientCommunication.js
@@ -276,7 +276,6 @@ function updateStatus(component) {
 }
 
 function updateValue(component) {
-
     let matches = document.getElementsByName(component.name);
     for (var j = 0; j < matches.length; j++) {
         let elem = matches[j];
@@ -285,9 +284,9 @@ function updateValue(component) {
             let text = htmlEscape(component.formatted);
             if (text) {
                 elem.innerHTML = text;
-                // elem.innerHTML = ' ein etwas zu langer, nein viel zu langer Text...';
             }
-        } else if (type == "input") {
+        } 
+        else if (type == "input") {
             let row = elem.closest('div');
             row.classList.remove('row-waiting-for-answer');
 
@@ -304,8 +303,6 @@ function updateValue(component) {
         } else if (type == "checkbox") {
             let row = elem.closest('div');
             row.classList.remove('row-waiting-for-answer');
-            
-            console.log('receive: ', component.value);
             if (component.value == 'False' || component.value == 'false' || component.value == 0) {
                 elem.checked = false;
             } else {
diff --git a/client/jsFiles/SEAWebClientGroup.js b/client/jsFiles/SEAWebClientGroup.js
index 8e2f419..15fb741 100644
--- a/client/jsFiles/SEAWebClientGroup.js
+++ b/client/jsFiles/SEAWebClientGroup.js
@@ -7,7 +7,6 @@ var prompt = false // True while a prompt is opened.
 // COMMUNICATION
 
 function getGroup(s, name) {
-    console.log('name: ',name, ', id: '.ClientID);
     reqJSON(s, "http://" + hostPort + "/getblock?path=" + name
             + "&id=" + clientID, successHandler, errorHandler);
 }
@@ -155,7 +154,8 @@ function createRightColumnForModules(component) {
             component.type == 'pushbutton' ||
             component.type == 'checkbox' ||
             component.type == 'enum'
-        ) {
+        ) { 
+            console.log(component.type);
             let input_element = createType(component);
             if (component.type != 'pushbutton') {
                 let icon_edit = createIconEdit(input_element);
@@ -254,7 +254,7 @@ function createPushbutton(component) {
     
     button.onclick = function () {
         let row = button.closest('div');
-        row.classList.add('row-waiting-for-answer');
+        // row.classList.add('row-waiting-for-answer');
         sendCommand(s, component.command);
     }
     let elem = document.createElement('span');
@@ -380,10 +380,8 @@ function createCheckbox(component) {
     }
 
     function handleCheckbox() {
-        console.log('handle checkbox');
         let row = input.closest('div');
         row.classList.add('row-waiting-for-answer');
-        console.log('send ', input.checked);
         sendCommand(s, component.command + " " + input.checked);
         // hideInputElements();
     };
@@ -466,21 +464,21 @@ function resizeTextfield(input) {
 // CONTENT
 
 function appendToGridElement(s, title, type, content) {
-    var panel = document.createElement('div');
+    let panel = document.createElement('div');
     panel.classList.add("panel");
 
     titlewrapper = document.createElement('span');
     titlewrapper.innerHTML = title;
     panel.appendChild(titlewrapper);
 
-    var gridContainer = document.createElement('div');
+    let gridContainer = document.createElement('div');
     gridContainer.classList.add("grid-container");
     // Store type so it can be found easiely later.
     gridContainer.slideType = type;
     gridContainer.appendChild(panel);
     gridContainer.appendChild(content);
 
-    var gridelements = document.getElementsByClassName('grid-element');
+    let gridelements = document.getElementsByClassName('grid-element');
                     gridelements[s].innerHTML = "";
                     gridelements[s].appendChild(gridContainer);
 }
diff --git a/client/jsFiles/SEAWebClientMain.js b/client/jsFiles/SEAWebClientMain.js
index 3d8740b..e43b447 100644
--- a/client/jsFiles/SEAWebClientMain.js
+++ b/client/jsFiles/SEAWebClientMain.js
@@ -182,27 +182,26 @@ window.onload = function() {
         let array_icon_edit = document.getElementsByClassName('icon-edit');
         let array_button = document.getElementsByClassName('input-element-button');
         if (writePermission == false) {
-            // TODO: here instead of asking "Please confirm we are on <instrument>", do not show the instrument,
-            // ask the user "Please confrim the instrument:" and check it the entered instrument is correct
-            // (case insensitive)
-            alertify.confirm("WRITE PERMISSION", "Current device: <b>"+ window.device
-                             + "</b>. Please confirm we are on <b>" + window.instrument + "</b>",
-            function () {
-                // User decided to proceed.
-                prompt = false;
-
-                writePermission = true;
-                icon_lock_container.innerHTML = '<img class = "icon-main icon-lock" src="res/icon_lock_open.png">';
-                for(i = 0; i < array_icon_edit.length; i++) {
-                    array_icon_edit[i].classList.remove('icon-edit-hidden');
-                }
-                for(i = 0; i < array_button.length; i++) {
-                    array_button[i].classList.remove('input-element-button-hidden');
+            alertify.prompt( 'WRITE PERMISSION', "Please enter the name of the instrument you want to work on."
+            , function(evt, value) {
+                // User decided to proceed
+                if (clientTitle.includes(value)) {
+                    writePermission = true;
+                    icon_lock_container.innerHTML = '<img class = "icon-main icon-lock" src="res/icon_lock_open.png">';
+                    for(i = 0; i < array_icon_edit.length; i++) {
+                        array_icon_edit[i].classList.remove('icon-edit-hidden');
+                    }
+                    for(i = 0; i < array_button.length; i++) {
+                        array_button[i].classList.remove('input-element-button-hidden');
+                    }
+                } else {
+                    console.log(clientTitle);
                 }
+                // prompt = false;
             }
-            , function () {
+            , function() {
                 // User decided to cancel
-                prompt = false;
+                prompt = false; 
             });
         } else {
             writePermission = false;
diff --git a/client/jsFiles/SEAWebClientResponsivity.js b/client/jsFiles/SEAWebClientResponsivity.js
index d1878c0..03d4a0c 100644
--- a/client/jsFiles/SEAWebClientResponsivity.js
+++ b/client/jsFiles/SEAWebClientResponsivity.js
@@ -16,9 +16,14 @@ function createGrid() {
     // 4 - log
     var elements = [];
     for (var i = 0; i < 4; i++) {
-        var element = document.createElement('div');
+        let element = document.createElement('div');
         element.classList.add("grid-element");
         element.classList.add("grid-element-"+i);
+
+        let panel_background = document.createElement('div');
+        panel_background.classList.add("panel");
+        element.appendChild(panel_background);
+
         document.getElementById("center").appendChild(element);
         elements.push(element);
     }