diff --git a/agkyra/nwgui/menu.html b/agkyra/nwgui/menu.html
index 38abaefe41a0823792f3360e559d242d7eed3fff..6c758a5224f117d937e538fd979f17d94ba5894e 100644
--- a/agkyra/nwgui/menu.html
+++ b/agkyra/nwgui/menu.html
@@ -172,7 +172,7 @@ function activate_menu() {
     settings_menu.enabled = true;
     tray.menu = menu;
   }
-  if ((!pithos_page_menu.enabled) && get_pithos_ui() != null){
+  if ((!pithos_page_menu.enabled) && get_pithos_ui()){
     pithos_page_menu.enabled = true;
     tray.menu = menu;
   }
diff --git a/agkyra/nwgui/notify.js b/agkyra/nwgui/notify.js
index 2d585a6bea009fd33fb4d5b202531e02b790e918..faff8b27672cb6ede6a61854a8f9b63a49e87dd8 100644
--- a/agkyra/nwgui/notify.js
+++ b/agkyra/nwgui/notify.js
@@ -1,3 +1,18 @@
+// Copyright (C) 2015 GRNET S.A.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 var gui = require('nw.gui');
 
 function is_up(code) { return (code / 100 >> 0) === 1; }
diff --git a/agkyra/nwgui/settings.html b/agkyra/nwgui/settings.html
index 96a19cb7bd6daf3e8b53a6b27c1176338fa7d18a..b736e0b732f596abb9deac4f08c4c703b6d5d761 100644
--- a/agkyra/nwgui/settings.html
+++ b/agkyra/nwgui/settings.html
@@ -225,11 +225,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     var lang = LANG[key];
                     var checked = ''
                     if (key === cur_lang) checked = 'checked'
-                    lang_code += '<div class="small-1 columns">'
-                        + '<input type="radio" name="language" value="' + key + '" '
+                    lang_code += '<div class="lang">'
+                        + '<input type="radio" name="language" '
+                        + 'id="button_' + key+ '" value="' + key + '" '
                         + checked
                         + ' onclick="cur_lang=\'' + key + '\'; localize();">'
-                        + lang.name + '<img src="' + lang.icon + '"/></input></div>';
+                        + '<label for="button_' + key + '">' + lang.name
+                        + ' <img src="' + lang.icon + '"/></label></input></div>';
                 }
                 document.getElementById('language_space').innerHTML = lang_code;
             }
diff --git a/agkyra/nwgui/static/stylesheets/main.css b/agkyra/nwgui/static/stylesheets/main.css
index a133c708302580f1f57012c28c4e4d50edd10fcd..49d8482f8cbf0a5cc4cf5f9e79fd9f41b826abad 100644
--- a/agkyra/nwgui/static/stylesheets/main.css
+++ b/agkyra/nwgui/static/stylesheets/main.css
@@ -216,4 +216,18 @@ textarea {
 
 #directory {
     word-break: break-all;
-}
\ No newline at end of file
+}
+
+#start_sync,
+#language_space {
+    padding: 0.5625rem 0px;
+}
+
+.lang {
+    display: inline-block;
+    margin-right: 1rem;
+}
+.lang label {
+    display: inline-block;
+    vertical-align: top;
+}
diff --git a/agkyra/ui_data/common_el.json b/agkyra/ui_data/common_el.json
index 55fad32e7fed447681f01b724820c756d45fc3e9..a51998128fcfc3ef7d9c64c5ec6c2ef72e41edd2 100644
--- a/agkyra/ui_data/common_el.json
+++ b/agkyra/ui_data/common_el.json
@@ -17,14 +17,14 @@
         "0": "Ξ‘Ξ½Ξ΅Ξ½Ξ΅ΟΞ³ΟŒ",
         "1": "Εκκίνηση ...",
         "2": "ΞšΞ»Ξ΅Ξ―ΟƒΞΉΞΌΞΏ",
-        "100": "ΞšΞ±Ο„Ξ¬ΟƒΟ„Ξ±ΟƒΞ· συγχρονισμού",
-        "101": "Παύση",
-        "102": "ΞšΞ±Ο„Ξ¬ΟƒΟ„Ξ±ΟƒΞ· παύσης",
+        "100": "ΣΡ ΟƒΟ…Ξ³Ο‡ΟΞΏΞ½ΞΉΟƒΞΌΟŒ",
+        "101": "ΣΡ διαδικασία παύσης",
+        "102": "ΣΡ παύση",
         "200": "ΑνΡπαρκΡίς ρυθμίσΡις",
         "201": "Σφάλμα ΞΌΞ΅ το URL",
         "202": "Σφάλμα ταυτοποίησης χρΞ�στη",
         "203": "Σφάλμα ΞΌΞ΅ τον Ο„ΞΏΟ€ΞΉΞΊΟŒ φάκΡλο",
-        "204": "Σφάλμα ΞΌΞ΅ τον απομακρυσμένο αποταμιΡυτΞ�ρα",
+        "204": "Σφάλμα ΞΌΞ΅ τον απομακρυσμένο πΡριέκτη (container)",
         "1000": "ΞšΟΞ―ΟƒΞΉΞΌΞΏ σφάλμα"
     },
     "MENU": {
@@ -35,7 +35,7 @@
         "WAITING": "ΑναμονΞ�...",
         "REMAINING": "απομένουν %s",
         "FOLDER": "Ξ€ΞΏΟ€ΞΉΞΊΟŒΟ‚ φάκΡλος",
-        "PITHOS": "ΣΡλίδα στον Pithos+",
+        "PITHOS": "ΣΡλίδα στο Pithos+",
         "SETTINGS": "ΑυθμίσΡις",
         "SETTINGSOPEN": "Ξ‘Ξ½ΞΏΞΉΟ‡Ο„ΟŒ παράθυρο ρυθμίσΡων",
         "ABOUT": "ΣχΡτικά",
@@ -56,7 +56,7 @@
         "TOKEN": "ΚλΡιδί token",
         "RETRIEVE": "Είσοδος ΞΌΞ΅ όνομα χρΞ�στη/ΞΊΟ‰Ξ΄ΞΉΞΊΟŒ",
         "SYNC": "΀ι Ξ½Ξ± συγχρονιστΡί",
-        "CONTAINER": "ΑποταμιΡυτΞ�ρας (container)",
+        "CONTAINER": "ΠΡριέκτης (container)",
         "DIRECTORY": "Ξ€ΞΏΟ€ΞΉΞΊΟŒΟ‚ φάκΡλος",
         "DIRDIALOGUE": "ΕπιλογΞ� φακέλου",
         "SAVE": "ΑποθΞ�κΡυση"