diff --git a/composer.json b/composer.json
index 8dd8b0daac4..fcf1cbc69b5 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,8 @@
         "bower-asset/leaflet": "0.7.3",
         "bower-asset/jquery-ace": "1.*",
         "bower-asset/jquery": "2.*",
-        "zendframework/zend-xmlrpc": "^2.5@dev"
+        "zendframework/zend-xmlrpc": "^2.5@dev",
+        "bower-asset/handsontable": "^0.20.2"
     },
     "autoload" : {
         "classmap" : [
diff --git a/composer.lock b/composer.lock
index 386a7c9fa25..57d8f83a28d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ebb7ea5df152b4614b885d996d5da28d",
-    "content-hash": "cea181f5170b2cd7effe8e4394b545d3",
+    "hash": "1bb198cdb54323890e6ab5232ecc6401",
+    "content-hash": "3e0e4884134c39c769bc6ae43616df8a",
     "packages": [
         {
             "name": "2amigos/yiiwheels",
@@ -253,6 +253,60 @@
             "description": "Font Awesome",
             "time": "2015-08-19 18:38:02"
         },
+        {
+            "name": "bower-asset/handsontable",
+            "version": "0.20.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/handsontable/handsontable.git",
+                "reference": "5a8dc8c1b903a9a8be84f2da25c7b6a85bc1fee5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/handsontable/handsontable/zipball/5a8dc8c1b903a9a8be84f2da25c7b6a85bc1fee5",
+                "reference": "5a8dc8c1b903a9a8be84f2da25c7b6a85bc1fee5",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/moment": ">=2.9.0,<3.0.0",
+                "bower-asset/pikaday": ">=1.3.2,<2.0.0",
+                "bower-asset/zeroclipboard": ">=2.2.0,<3.0.0"
+            },
+            "require-dev": {
+                "bower-asset/chroma-js": "~0.5.6"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "./dist/handsontable.js",
+                    "./dist/handsontable.css"
+                ],
+                "bower-asset-ignore": [
+                    "**/.*",
+                    "components",
+                    "demo",
+                    "node_modules",
+                    "src",
+                    "test"
+                ]
+            },
+            "description": "Spreadsheet-like data grid editor that provides copy/paste functionality compatible with Excel/Google Docs",
+            "keywords": [
+                "data",
+                "data-grid",
+                "data-spreadsheet",
+                "data-table",
+                "edit-cell",
+                "editable-table",
+                "editor",
+                "excel",
+                "grid",
+                "grid-editor",
+                "spreadsheet",
+                "table",
+                "tabular-data"
+            ]
+        },
         {
             "name": "bower-asset/jqgrid",
             "version": "v5.0.1",
@@ -566,6 +620,43 @@
             },
             "description": "JavaScript library for mobile-friendly interactive maps"
         },
+        {
+            "name": "bower-asset/moment",
+            "version": "2.10.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/moment/moment.git",
+                "reference": "f3fbef9d9875bbff340b527dbe3f1c447a942f69"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/moment/moment/zipball/f3fbef9d9875bbff340b527dbe3f1c447a942f69",
+                "reference": "f3fbef9d9875bbff340b527dbe3f1c447a942f69",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "moment.js",
+                "bower-asset-ignore": [
+                    "**/.*",
+                    "benchmarks",
+                    "bower_components",
+                    "meteor",
+                    "node_modules",
+                    "scripts",
+                    "tasks",
+                    "test",
+                    "component.json",
+                    "composer.json",
+                    "CONTRIBUTING.md",
+                    "ender.js",
+                    "Gruntfile.js",
+                    "Moment.js.nuspec",
+                    "package.js",
+                    "package.json"
+                ]
+            }
+        },
         {
             "name": "bower-asset/papaparse",
             "version": "4.1.2",
@@ -619,6 +710,43 @@
                 "workers"
             ]
         },
+        {
+            "name": "bower-asset/pikaday",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dbushell/Pikaday.git",
+                "reference": "651842140ee0f872f3364c33a34e2b595fd72d43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dbushell/Pikaday/zipball/651842140ee0f872f3364c33a34e2b595fd72d43",
+                "reference": "651842140ee0f872f3364c33a34e2b595fd72d43",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "./pikaday.js",
+                    "./css/pikaday.css"
+                ],
+                "bower-asset-ignore": [
+                    "**/.*",
+                    "node_modules",
+                    "components"
+                ]
+            },
+            "license": [
+                "BSD",
+                "MIT"
+            ],
+            "description": "A refreshing JavaScript Datepicker — lightweight, no dependencies, modular CSS",
+            "keywords": [
+                "calendar",
+                "date",
+                "datepicker"
+            ]
+        },
         {
             "name": "bower-asset/qtip2",
             "version": "v2.2.0",
@@ -945,6 +1073,48 @@
                 "widgets"
             ]
         },
+        {
+            "name": "bower-asset/zeroclipboard",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zeroclipboard/zeroclipboard.git",
+                "reference": "039fb799c916d3730fbc898c2f5ef24581c7e9b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zeroclipboard/zeroclipboard/zipball/039fb799c916d3730fbc898c2f5ef24581c7e9b7",
+                "reference": "039fb799c916d3730fbc898c2f5ef24581c7e9b7",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "dist/ZeroClipboard.js",
+                    "dist/ZeroClipboard.swf"
+                ],
+                "bower-asset-ignore": [
+                    "*",
+                    "/dist/.jshintrc",
+                    "!/bower.json",
+                    "!/dist/**"
+                ]
+            },
+            "license": [
+                "https://github.com/zeroclipboard/zeroclipboard/blob/master/LICENSE"
+            ],
+            "description": "The ZeroClipboard library provides an easy way to copy text to the clipboard using an invisible Adobe Flash movie and a JavaScript interface.",
+            "keywords": [
+                "clip",
+                "clipboard",
+                "clippy",
+                "copy",
+                "cut",
+                "flash",
+                "paste",
+                "zclip"
+            ]
+        },
         {
             "name": "cakephp/utility",
             "version": "3.1.x-dev",
@@ -1782,12 +1952,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Studio-42/elFinder.git",
-                "reference": "e1ebe5fa1eef821dc5d3b3f8c4dc219519b0e2de"
+                "reference": "89625cc1d0b57aef24de0fd334c16c514321f317"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/e1ebe5fa1eef821dc5d3b3f8c4dc219519b0e2de",
-                "reference": "e1ebe5fa1eef821dc5d3b3f8c4dc219519b0e2de",
+                "url": "https://api.github.com/repos/Studio-42/elFinder/zipball/89625cc1d0b57aef24de0fd334c16c514321f317",
+                "reference": "89625cc1d0b57aef24de0fd334c16c514321f317",
                 "shasum": ""
             },
             "require": {
@@ -1833,7 +2003,7 @@
             ],
             "description": "File manager for web",
             "homepage": "http://elfinder.org",
-            "time": "2015-12-13 11:57:14"
+            "time": "2015-12-16 13:16:26"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -1904,12 +2074,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c"
+                "reference": "71a0bfee8eef70999f9a2c486901b2b55a890b27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c",
-                "reference": "ad716b9ea9506456f28e2c1bcdd7b4a81b44c11c",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/71a0bfee8eef70999f9a2c486901b2b55a890b27",
+                "reference": "71a0bfee8eef70999f9a2c486901b2b55a890b27",
                 "shasum": ""
             },
             "replace": {
@@ -1947,7 +2117,7 @@
                 "responsive",
                 "web"
             ],
-            "time": "2015-12-10 23:05:45"
+            "time": "2015-12-17 05:55:54"
         },
         {
             "name": "yiisoft/yii",
@@ -2097,12 +2267,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zendframework/zend-diactoros.git",
-                "reference": "64cdc57b544d396b68b2db3513d3f4e701e8f3a9"
+                "reference": "edc732c7d3457b880134cc1abbaef67ae0cd0452"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/64cdc57b544d396b68b2db3513d3f4e701e8f3a9",
-                "reference": "64cdc57b544d396b68b2db3513d3f4e701e8f3a9",
+                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/edc732c7d3457b880134cc1abbaef67ae0cd0452",
+                "reference": "edc732c7d3457b880134cc1abbaef67ae0cd0452",
                 "shasum": ""
             },
             "require": {
@@ -2119,8 +2289,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev",
-                    "dev-develop": "1.3-dev"
+                    "dev-master": "1.3-dev",
+                    "dev-develop": "1.4-dev"
                 }
             },
             "autoload": {
@@ -2139,7 +2309,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2015-11-26 22:34:19"
+            "time": "2015-12-16 16:31:21"
         },
         {
             "name": "zendframework/zend-escaper",
diff --git a/protected/config/packages.php b/protected/config/packages.php
index 2f75d623cde..dfebcfcb84c 100644
--- a/protected/config/packages.php
+++ b/protected/config/packages.php
@@ -166,5 +166,19 @@
         'depends' => [
             'jquery'
         ]
+    ],
+    'handsontable' => [
+        'basePath' => 'bower.handsontable',
+        'js' => [
+            'dist/handsontable.full.min.js',
+            'plugins/jqueryHandsontable.js'
+        ],
+        'css' => [
+            'dist/handsontable.full.css',
+            'plugins/bootstrap/handsontable.bootstrap.css'
+        ],
+        'depends' => [
+            'jquery'
+        ]
     ]
 ];
diff --git a/protected/controllers/AdminController.php b/protected/controllers/AdminController.php
index 7dbb1c74c90..2d8c286bff4 100644
--- a/protected/controllers/AdminController.php
+++ b/protected/controllers/AdminController.php
@@ -44,7 +44,7 @@ protected function _init()
             updateCheck();
 
         //unset(Yii::app()->session['FileManagerContext']);
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "admin_core.js");
+        App()->getClientScript()->registerScriptFile(App()->getPublicUrl() . "/scripts/admin/admin_core.js");
         $this->user_id = Yii::app()->user->getId();
         if (!Yii::app()->getConfig("surveyid")) {Yii::app()->setConfig("surveyid", returnGlobal('sid'));}         //SurveyID
         if (!Yii::app()->getConfig("ugid")) {Yii::app()->setConfig("ugid", returnGlobal('ugid'));}                //Usergroup-ID
@@ -400,7 +400,7 @@ public function _showadminmenu($surveyid = false)
         }
         $aData['surveyid'] = $surveyid;
         $aData['iconsize'] = Yii::app()->getConfig('adminthemeiconsize');
-        $aData['sImageURL'] = Yii::app()->getConfig('adminimageurl');
+        $aData['sImageURL'] = App()->theme->baseUrl. '/images';
         $this->renderPartial("/admin/super/adminmenu", $aData);
 
     }
@@ -416,6 +416,6 @@ public function _loadEndScripts()
 
         unset(Yii::app()->session['metaHeader']);
 
-        return $this->renderPartial('/admin/endScripts_view', []);
+//        return $this->renderPartial('/admin/endScripts_view', []);
     }
 }
diff --git a/protected/controllers/Controller.php b/protected/controllers/Controller.php
index fff23b5ce07..e0cf2c29a35 100644
--- a/protected/controllers/Controller.php
+++ b/protected/controllers/Controller.php
@@ -64,8 +64,8 @@ protected function _init()
             Yii::app()->setConfig("timeadjust",$timeadjust.' hours');
         }
 
-        Yii::app()->setConfig('adminimageurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/images/');
-        Yii::app()->setConfig('adminstyleurl', Yii::app()->getConfig('styleurl').Yii::app()->getConfig('admintheme').'/');
+        Yii::app()->setConfig('adminimageurl', App()->theme->baseUrl. '/images/');
+        Yii::app()->setConfig('adminstyleurl', App()->publicUrl . '/styles/gringegreen/');
     }
 
     /**
diff --git a/protected/controllers/FilesController.php b/protected/controllers/FilesController.php
index a55929a50b9..7b9e13992eb 100644
--- a/protected/controllers/FilesController.php
+++ b/protected/controllers/FilesController.php
@@ -79,6 +79,7 @@ protected function getRootForSurvey($surveyId) {
         return [
             'alias' => "ls\models\Survey ({$surveyId})",
             'driver' => 'LocalFileSystem',
+            'autoload' => true,
             'path'   => $dir,
             'URL' => App()->publicUrl . $relative,
             'icon' => "{$this->getAssetsUrl()}/img/volume_icon_local.png",
@@ -106,6 +107,7 @@ protected function getRootForTemplate($template) {
             $result[] = [
                 'alias' => "ls\models\Template ({$template})",
                 'driver' => 'LocalFileSystem',
+                'autoload' => true,
                 'path' => $dir,
                 'URL' => App()->baseUrl . $url,
                 'mimeMap' => [
diff --git a/protected/controllers/LabelsController.php b/protected/controllers/LabelsController.php
new file mode 100644
index 00000000000..c97f7cd313b
--- /dev/null
+++ b/protected/controllers/LabelsController.php
@@ -0,0 +1,51 @@
+<?php
+
+
+namespace ls\controllers;
+
+
+use ls\models\LabelSet;
+
+class LabelsController extends Controller
+{
+    public function actionIndex()
+    {
+        return $this->render('index', [
+            'dataProvider' => new \CActiveDataProvider(LabelSet::class)
+        ]);
+    }
+
+    public function actionCreate()
+    {
+        $model = new LabelSet();
+        if (App()->request->isPostRequest) {
+            $model->setAttributes(App()->request->getPost(\CHtml::modelName($model)));
+
+            if ($model->save()) {
+                App()->user->setFlash('success', gT("Label set created!"));
+                return $this->redirect(['labels/update', 'id' => $model->lid]);
+            }
+        }
+        $this->render('create', ['model' => $model]);
+    }
+
+    public function actionUpdate($id)
+    {
+        $model = LabelSet::model()->findByPk($id);
+        if (isset($model)) {
+            if (App()->request->isPutRequest) {
+                $model->setAttributes(App()->request->getPost(\CHtml::modelName($model)));
+
+                if ($model->save()) {
+                    App()->user->setFlash('success', gT("Label set updated!"));
+                    return $this->redirect(['labels/update', 'id' => $model->lid]);
+                }
+            }
+            $this->render('update', ['model' => $model]);
+
+        }
+    }
+
+
+//    public funct
+}
\ No newline at end of file
diff --git a/protected/controllers/UpgradeController.php b/protected/controllers/UpgradeController.php
index 64cda659da7..0894f77314c 100644
--- a/protected/controllers/UpgradeController.php
+++ b/protected/controllers/UpgradeController.php
@@ -119,6 +119,7 @@ protected function runPreCheck($version)
         $json = $this->getFileContentsCached(App()->params['updateServer'] . 'prepare', [
             'query' => ['from' => App()->params['version'], 'to' => $version]
         ]);
+
         $preUpdate->loadFromString($json, null);
         return ['success' => $preUpdate->run(), 'messages' => $preUpdate->getMessages(), 'changeLog' => $preUpdate->getChangeLog()];
     }
diff --git a/protected/controllers/UploaderController.php b/protected/controllers/UploaderController.php
index dc533163792..e7f7a5fbad5 100644
--- a/protected/controllers/UploaderController.php
+++ b/protected/controllers/UploaderController.php
@@ -284,18 +284,18 @@ function actionIndex($sid, $fieldname, $qid, $show_title, $show_comment, $minfil
         $sTemplateUrl = \ls\models\Template::getTemplateURL($aSurveyInfo['template']) . "/";
         App()->clientScript->registerScript('sNeededScriptVar', $sNeededScriptVar, CClientScript::POS_HEAD);
         App()->clientScript->registerScript('sLangScriptVar', $sLangScriptVar, CClientScript::POS_HEAD);
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts") . 'ajaxupload.js');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts") . 'uploader.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/' . 'ajaxupload.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/' . 'uploader.js');
         App()->getClientScript()->registerScriptFile("{$sTemplateUrl}template.js");
-        App()->clientScript->registerCssFile(Yii::app()->getConfig("publicstyleurl") . "uploader.css");
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . "uploader-files.css");
+        App()->clientScript->registerCssFile(App()->publicUrl . '/styles-public/' . "uploader.css");
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . "uploader-files.css");
 
         if (file_exists($sTemplateDir . DIRECTORY_SEPARATOR . 'jquery-ui-custom.css')) {
             Yii::app()->getClientScript()->registerCssFile("{$sTemplateUrl}jquery-ui-custom.css");
         } elseif (file_exists($sTemplateDir . DIRECTORY_SEPARATOR . 'jquery-ui.css')) {
             Yii::app()->getClientScript()->registerCssFile("{$sTemplateUrl}jquery-ui.css");
         } else {
-            Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . "jquery-ui.css");
+            Yii::app()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . "jquery-ui.css");
         }
         App()->clientScript->registerCssFile("{$sTemplateUrl}template.css");
         $header = getHeader($meta);
diff --git a/protected/controllers/admin/assessments.php b/protected/controllers/admin/assessments.php
index 17ca690fd04..6657146a0f4 100644
--- a/protected/controllers/admin/assessments.php
+++ b/protected/controllers/admin/assessments.php
@@ -75,7 +75,7 @@ public function index($iSurveyID)
      */
     protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls = [], $aData = [])
     {
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'assessments.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'assessments.js');
         App()->getClientScript()->registerPackage('jquery-tablesorter');
         
 
diff --git a/protected/controllers/admin/conditionsaction.php b/protected/controllers/admin/conditionsaction.php
index effcf3f37dd..16d45b5a481 100644
--- a/protected/controllers/admin/conditionsaction.php
+++ b/protected/controllers/admin/conditionsaction.php
@@ -1632,7 +1632,8 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
             if (isset($conditionsList) && is_array($conditionsList))
             {
                 //TIBO
-                App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'jquery/jquery.multiselect.min.js');
+
+                App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/'.'jquery/jquery.multiselect.min.js');
 
                 // TODO
                 $aViewUrls['output'] .= "<script type='text/javascript'>$(document).ready(function () { $('#copytomultiselect').multiselect( { autoOpen: true, noneSelectedText: '".gT("No questions selected")."', checkAllText: '".gT("Check all")."', uncheckAllText: '".gT("Uncheck all")."', selectedText: '# ".gT("selected")."', beforeclose: function(){ return false;},height: 200 } ); });</script>";
@@ -1942,7 +1943,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
 
 
             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("adminscripts").'conditions.js');
-            //App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'jquery/lime-conditions-tabs.js');
+            //App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/'.'jquery/lime-conditions-tabs.js');
 
             if ($subaction == "editthiscondition" && isset($p_cid))
             {
diff --git a/protected/controllers/admin/dataentry.php b/protected/controllers/admin/dataentry.php
index b455b95c4c8..899fc7cbc1c 100644
--- a/protected/controllers/admin/dataentry.php
+++ b/protected/controllers/admin/dataentry.php
@@ -884,7 +884,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                             $aDataentryoutput .= '</div>';
                             App()->getClientScript()->registerPackage('jquery-actual');
                             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'ranking.js');
-                            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'ranking.css');
+                            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . 'ranking.css');
                             $aDataentryoutput .= "<script type='text/javascript'>\n"
                                 .  "  <!--\n"
                                 . "var aRankingTranslations = {
@@ -955,7 +955,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                             {
                                 $aDataentryoutput.="<option value='{$lang}'";
                                 if ($lang == $idrow[$fname['fieldname']]) {$aDataentryoutput .= " selected='selected'";}
-                                $aDataentryoutput.=">".getLanguageNameFromCode($lang,false)."</option>\n";
+                                $aDataentryoutput.=">".\ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false)."</option>\n";
                             }
                             $aDataentryoutput .= "</select>";
                             break;
@@ -1465,8 +1465,8 @@ public function update()
                 throw new \CHttpException(500, "Update failed:<br />\n<br />$updateqr");
             }
 
-            $onerecord_link = $this->getController()->createUrl('/admin/responses/sa/view/surveyid/'.$surveyid.'/id/'.$id);
-            $allrecords_link = $this->getController()->createUrl('/admin/responses/sa/index/surveyid/'.$surveyid);
+            $onerecord_link = $this->getController()->createUrl('admin/responses', ['sa' => 'view', 'surveyid' => $surveyid, 'id' => $id]);
+            $allrecords_link = $this->getController()->createUrl('admin/responses', ['sa' => 'index', 'surveyid' => $surveyid]);
             $aDataentryoutput .= "<div class='messagebox ui-corner-all'><div class='successheader'>".gT("Success")."</div>\n"
             .gT("Record has been updated.")."<br /><br />\n"
             ."<input type='submit' value='".gT("View This Record")."' onclick=\"window.open('$onerecord_link', '_top')\" /><br /><br />\n"
@@ -2137,7 +2137,7 @@ public function view($surveyid, $lang=NULL)
                             $cdata['answers']=$answers;
                             App()->getClientScript()->registerPackage('jquery-actual');
                             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts') . 'ranking.js');
-                            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'ranking.css');
+                            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . 'ranking.css');
                             unset($answers);
                             break;
                         case "M": //Multiple choice checkbox (Quite tricky really!)
diff --git a/protected/controllers/admin/export.php b/protected/controllers/admin/export.php
index 204b3d5afa1..286fd28a401 100644
--- a/protected/controllers/admin/export.php
+++ b/protected/controllers/admin/export.php
@@ -149,7 +149,7 @@ public function exportresults()
         Yii::app()->loadHelper("admin/exportresults");
 
         App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."expressions/em_javascript.js");
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . '/exportresults.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . '/exportresults.js');
 
         $sExportType = Yii::app()->request->getPost('type');
         $sHeadingFormat = Yii::app()->request->getPost('headstyle');
@@ -249,7 +249,7 @@ public function exportresults()
             $aLanguagesCode=Survey::model()->findByPk($iSurveyID)->getAllLanguages();
             $aLanguages= [];
             foreach ($aLanguagesCode as $sLanguage){
-                $aLanguages[$sLanguage]=getLanguageNameFromCode($sLanguage,false);
+                $aLanguages[$sLanguage]=\ls\helpers\SurveyTranslator::getLanguageNameFromCode($sLanguage,false);
             }
             $data['aLanguages'] = $aLanguages;    // Pass available exports
 
diff --git a/protected/controllers/admin/expressions.php b/protected/controllers/admin/expressions.php
index eaff9294be1..b19a691e3b7 100644
--- a/protected/controllers/admin/expressions.php
+++ b/protected/controllers/admin/expressions.php
@@ -35,7 +35,7 @@ function index()
             App()->getClientScript()->registerPackage('jqueryui');
             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."survey_runtime.js");
             App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."expressions/em_javascript.js");
-            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle.css" );
+            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "adminstyle.css" );
             $this->_printOnLoad(Yii::app()->request->getQuery('sa', 'index'));
             $aData['pagetitle']="ExpressionManager:  {$aData['sa']}";
             //header("Content-type: text/html; charset=UTF-8"); // needed for correct UTF-8 encoding
diff --git a/protected/controllers/admin/labels.php b/protected/controllers/admin/labels.php
index de5c6f580ee..352bd8eb21a 100644
--- a/protected/controllers/admin/labels.php
+++ b/protected/controllers/admin/labels.php
@@ -227,8 +227,8 @@ public function view($lid = 0)
         $aData = [];
 
         // Includes some javascript files
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'labels.js');
-        App()->getClientScript()->registerPackage('jquery-json');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'labels.js');
+//        App()->getClientScript()->registerPackage('jquery-json');
         // Checks if user have the sufficient rights to manage the labels
         if (App()->user->checkAccess('labelsets'))
         {
@@ -345,7 +345,7 @@ public function exportmulti()
     {
         if (Permission::model()->hasGlobalPermission('labelsets','export'))
         {
-            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'labels.js');
+            App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'labels.js');
             $this->_renderWrappedTemplate('labels', 'exportmulti_view');
         }
     }
diff --git a/protected/controllers/admin/participantsaction.php b/protected/controllers/admin/participantsaction.php
index f7746bf770a..0693b9d81fb 100644
--- a/protected/controllers/admin/participantsaction.php
+++ b/protected/controllers/admin/participantsaction.php
@@ -69,7 +69,7 @@ private function _loadjqGrid($sScript = '', $aData = [])
         App()->getClientScript()->registerPackage('jqgrid');
         if (!empty($sScript))
         {
-            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . $sScript . '.js');
+            App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . $sScript . '.js');
             $this->_renderWrappedTemplate('participants', ['participantsPanel', $sScript], $aData);
         }
     }
@@ -256,7 +256,7 @@ function displayParticipants()
             'aAttributes' => ParticipantAttributeName::model()->findAll()
         ];
         App()->getClientScript()->registerPackage('jqgrid');
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl')  . 'displayParticipants.css');
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/'  . 'displayParticipants.css');
 
 
         // loads the participant panel view and display participant view
@@ -951,9 +951,9 @@ function viewAttribute()
             'attributevalues' => ParticipantAttributeName::model()->getAttributesValues($iAttributeId),
             'aAttributes' => ParticipantAttributeName::model()->findAll()
         ];
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl').'participants.css');
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl').'viewAttribute.css');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "viewAttribute.js");
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/'.'participants.css');
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/'.'viewAttribute.css');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . "viewAttribute.js");
         $this->_renderWrappedTemplate('participants', ['participantsPanel', 'viewAttribute'], $aData);
     }
 
@@ -1135,7 +1135,7 @@ function attributeMapCSV()
                 'participant_id_exists' => in_array('participant_id', $fieldlist)
             ];
         App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstysleurl') . "attributeMapCSV.css");
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "attributeMapCSV.js");
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . "attributeMapCSV.js");
 
         $sAttributeMapJS="var copyUrl = '".App()->createUrl("admin/participants/sa/uploadCSV")."';\n"
                         ."var displayParticipants = '".App()->createUrl("admin/participants/sa/displayParticipants")."';\n"
@@ -1281,8 +1281,8 @@ function addToTokenattmap()
     function attributeMap()
     {
         Yii::app()->loadHelper('common');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "attributeMap.js");
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') ."attributeMap.css");
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . "attributeMap.js");
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' ."attributeMap.css");
 
         $iSurveyId = Yii::app()->request->getPost('survey_id');
         $redirect = Yii::app()->request->getPost('redirect');
@@ -1356,8 +1356,8 @@ function attributeMap()
     function attributeMapToken()
     {
         Yii::app()->loadHelper('common');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "attributeMapToken.js");
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') ."attributeMapToken.css");
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . "attributeMapToken.js");
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' ."attributeMapToken.css");
 
         $iSurveyID = (int)Yii::app()->request->getQuery('sid');
         $aCPDBAttributes = ParticipantAttributeName::model()->getCPDBAttributes();
diff --git a/protected/controllers/admin/quotas.php b/protected/controllers/admin/quotas.php
index e208ebda499..a8a199e1e60 100644
--- a/protected/controllers/admin/quotas.php
+++ b/protected/controllers/admin/quotas.php
@@ -197,7 +197,7 @@ function insertquota($iSurveyId)
         {
             if (!$_POST['quotals_message_' . $sLang])
             {
-                $sError .= getLanguageNameFromCode($sLang, false) . "\\n";
+                $sError .= \ls\helpers\SurveyTranslator::getLanguageNameFromCode($sLang, false) . "\\n";
             }
         }
         if ($sError != '')
@@ -250,7 +250,7 @@ function modifyquota($iSurveyId)
         {
             if (!$_POST['quotals_message_' . $sLang])
             {
-                $sError.= getLanguageNameFromCode($sLang, false) . "\\n";
+                $sError.= \ls\helpers\SurveyTranslator::getLanguageNameFromCode($sLang, false) . "\\n";
             }
         }
         if ($sError != '')
@@ -352,7 +352,7 @@ function editquota($iSurveyId)
         $first=true;
         foreach ($aLangs as $sLanguage)
         {
-            $aTabTitles[$sLanguage] = getLanguageNameFromCode($sLanguage, false);
+            $aTabTitles[$sLanguage] = \ls\helpers\SurveyTranslator::getLanguageNameFromCode($sLanguage, false);
             if ($first)
             {
                 $aTabTitles[$sLanguage].= ' (' . gT("Base language") . ')';
@@ -524,7 +524,7 @@ function getQuotaAnswers($iQuestionId, $iSurveyId, $iQuotaId)
 
             while (list($key, $value) = each($slangs))
             {
-                $tmparrayans = ['Title' => $aQuestion['title'], 'Display' => getLanguageNameFromCode($value, false), $value];
+                $tmparrayans = ['Title' => $aQuestion['title'], 'Display' => \ls\helpers\SurveyTranslator::getLanguageNameFromCode($value, false), $value];
                 $aAnswerList[$value] = $tmparrayans;
             }
         }
@@ -558,7 +558,7 @@ function getQuotaAnswers($iQuestionId, $iSurveyId, $iQuotaId)
     protected function _renderWrappedTemplate($sAction = 'quotas', $aViewUrls = [], $aData = [])
     {
         
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . '/quotas.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . '/quotas.js');
         parent::_renderWrappedTemplate($sAction, $aViewUrls, $aData);
     }
 
diff --git a/protected/controllers/admin/saved.php b/protected/controllers/admin/saved.php
index 4b4a6bb5bbe..290a8389883 100644
--- a/protected/controllers/admin/saved.php
+++ b/protected/controllers/admin/saved.php
@@ -34,7 +34,7 @@ public function view($iSurveyId)
         }
 
         App()->getClientScript()->registerPackage('jquery-tablesorter');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'saved.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'saved.js');
 
         $aThisSurvey = getSurveyInfo($iSurveyId);
         $aData['sSurveyName'] = $aThisSurvey['name'];
diff --git a/protected/controllers/admin/statistics.php b/protected/controllers/admin/statistics.php
index 4a8199c25ad..d2735bd583b 100644
--- a/protected/controllers/admin/statistics.php
+++ b/protected/controllers/admin/statistics.php
@@ -104,13 +104,14 @@ public function run($surveyid = 0, $subaction = null)
 
 
         // Set language for questions and answers to base language of this survey
+
         $language = Survey::model()->findByPk($surveyid)->language;
         $aData['language'] = $language;
 
 
         //Call the javascript file
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'statistics.js');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'json-js/json2.min.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'statistics.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'json-js/json2.min.js');
 
         $aData['display']['menu_bars']['browse'] = gT("Quick statistics");
 
@@ -148,8 +149,7 @@ public function run($surveyid = 0, $subaction = null)
         */
 
         //store all the data in $rows
-        $rows = Question::model()->getQuestionList($surveyid, $language);
-
+        $rows = Survey::model()->findByPk($surveyid)->questions;
         //SORT IN NATURAL ORDER!
         usort($rows, 'groupOrderThenQuestionOrder');
 
@@ -163,7 +163,7 @@ public function run($surveyid = 0, $subaction = null)
                 $row['gid'],
                 $row['type'],
                 $row['title'],
-                $row['group_name'],
+                $row->group->title,
                 flattenText($row['question'])
             ];
         }
@@ -289,7 +289,7 @@ public function run($surveyid = 0, $subaction = null)
             {
                 case "K": // Multiple Numerical
                     //get answers
-                    $result = Question::model()->getQuestionsForStatistics('title as code, question as answer', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title as code, question as answer', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1]['key1'] = $result;
                     break;
 
@@ -298,7 +298,7 @@ public function run($surveyid = 0, $subaction = null)
                 case "Q": // Multiple Short Text
 
                     //get subqestions
-                    $result = Question::model()->getQuestionsForStatistics('title as code, question as answer', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title as code, question as answer', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     break;
 
@@ -307,7 +307,7 @@ public function run($surveyid = 0, $subaction = null)
                 case "A": // ARRAY OF 5 POINT CHOICE QUESTIONS
 
                     //get answers
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     break;
 
@@ -315,7 +315,7 @@ public function run($surveyid = 0, $subaction = null)
 
                     //just like above only a different loop
                 case "B": // ARRAY OF 10 POINT CHOICE QUESTIONS
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     break;
 
@@ -323,7 +323,7 @@ public function run($surveyid = 0, $subaction = null)
 
                 case "C": // ARRAY OF YES\No\gT("Uncertain") QUESTIONS
                     //get answers
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     break;
 
@@ -331,26 +331,26 @@ public function run($surveyid = 0, $subaction = null)
 
                     //similiar to the above one
                 case "E": // ARRAY OF Increase/Same/Decrease QUESTIONS
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     break;
 
                 case ";":  //ARRAY (Multi Flex) (Text)
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}' AND scale_id = 0", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND scale_id = 0", 'question_order');
                     $aData['result'][$key1] = $result;
                     foreach($result as $key => $row)
                     {
-                        $fresult = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}' AND scale_id = 1", 'question_order');
+                        $fresult = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND scale_id = 1", 'question_order');
                         $aData['fresults'][$key1][$key] = $fresult;
                     }
                     break;
 
                 case ":":  //ARRAY (Multi Flex) (Numbers)
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}' AND scale_id = 0", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND scale_id = 0", 'question_order');
                     $aData['result'][$key1] = $result;
                     foreach($result as $row)
                     {
-                        $fresult = Question::model()->getQuestionsForStatistics('*', "parent_qid=$flt[0] AND language = '{$language}' AND scale_id = 1", 'question_order, title');
+                        $fresult = Question::model()->getQuestionsForStatistics('*', "parent_qid=$flt[0] AND scale_id = 1", 'question_order, title');
                         $aData['fresults'][$key1] = $fresult;
                     }
                     break;
@@ -362,13 +362,13 @@ public function run($surveyid = 0, $subaction = null)
                 case "F": // FlEXIBLE ARRAY
                 case "H": // ARRAY (By Column)
                     //Get answers. We always use the answer code because the label might be too long elsewise
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
 
                     //check all the answers
                     foreach($result as $row)
                     {
-                        $fresult = Answer::model()->getQuestionsForStatistics('*', "qid=$flt[0] AND language = '{$language}'", 'sortorder, code');
+                        $fresult = Answer::model()->getQuestionsForStatistics('*', "qid=$flt[0]", 'sortorder, code');
                         $aData['fresults'][$key1] = $fresult;
                     }
 
@@ -380,14 +380,14 @@ public function run($surveyid = 0, $subaction = null)
 
                 case "R": //RANKING
                     //get some answers
-                    $result = Answer::model()->getQuestionsForStatistics('code, answer', "qid=$flt[0] AND language = '{$language}'", 'sortorder, answer');
+                    $result = Answer::model()->getQuestionsForStatistics('code, answer', "question_id=$flt[0]", 'sortorder, answer');
                     $aData['result'][$key1] = $result;
                     break;
 
                 case "1": // MULTI SCALE
 
                     //get answers
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0] AND language = '{$language}'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid=$flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     //loop through answers
                     foreach($result as $key => $row)
@@ -398,7 +398,7 @@ public function run($surveyid = 0, $subaction = null)
                         $aData['dshresults'][$key1][$key] = $dshresult;
 
 
-                        $fresult = Answer::model()->getQuestionsForStatistics('*', "qid=$flt[0] AND language = '{$language}' AND scale_id = 0", 'sortorder, code');
+                        $fresult = Answer::model()->getQuestionsForStatistics('*', "qid=$flt[0] AND scale_id = 0", 'sortorder, code');
 
                         $aData['fresults'][$key1][$key] = $fresult;
 
@@ -412,7 +412,7 @@ public function run($surveyid = 0, $subaction = null)
                 case "M":  //M - Multiple choice
 
                     //get answers
-                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid = $flt[0] AND language = '$language'", 'question_order');
+                    $result = Question::model()->getQuestionsForStatistics('title, question', "parent_qid = $flt[0]", 'question_order');
                     $aData['result'][$key1] = $result;
                     break;
 
@@ -427,7 +427,7 @@ public function run($surveyid = 0, $subaction = null)
                 default:
 
                     //get answers
-                    $result = Answer::model()->getQuestionsForStatistics('code, answer', "qid=$flt[0] AND language = '$language'", 'sortorder, answer');
+                    $result = Answer::model()->getQuestionsForStatistics('code, answer', "question_id=$flt[0]", 'sortorder, answer');
                     $aData['result'][$key1] = $result;
                     break;
 
diff --git a/protected/controllers/admin/translate.php b/protected/controllers/admin/translate.php
index 818ed42ac1f..83377c0239b 100644
--- a/protected/controllers/admin/translate.php
+++ b/protected/controllers/admin/translate.php
@@ -347,7 +347,7 @@ private function _getSurveyButton($iSurveyID, $menuitem_url)
 			foreach ( $tmp_survlangs as $tmp_lang )
 			{
 				$survey_button .= CHtml::tag('li', [],
-					CHtml::link(getLanguageNameFromCode($tmp_lang, FALSE), $menuitem_url . $tmp_lang, [
+					CHtml::link(\ls\helpers\SurveyTranslator::getLanguageNameFromCode($tmp_lang, FALSE), $menuitem_url . $tmp_lang, [
 						'target' 	=> 	'_blank',
 						'onclick' 	=> 	"$('.dosurvey').qtip('hide');",
 						'accesskey' => 	'd'
diff --git a/protected/controllers/admin/useraction.php b/protected/controllers/admin/useraction.php
index 7e64bf81060..ea698414758 100644
--- a/protected/controllers/admin/useraction.php
+++ b/protected/controllers/admin/useraction.php
@@ -39,7 +39,7 @@ function __construct($controller, $id)
     public function index()
     {
         App()->getClientScript()->registerPackage('jquery-tablesorter');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts').'users.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/'.'users.js');
 
         if (App()->user->checkAccess('superadmin')) {
             $noofsurveys = Survey::model()->countByAttributes(["owner_id" => App()->user->id]);
@@ -509,7 +509,7 @@ function setuserpermissions()
 
             $aData['oUser'] =$oUser;
             App()->getClientScript()->registerPackage('jquery-tablesorter');
-            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "userpermissions.js");
+            App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . "userpermissions.js");
             $this->_renderWrappedTemplate('user', 'setuserpermissions', $aData);
         }
         else
@@ -522,7 +522,7 @@ function setuserpermissions()
     function setusertemplates()
     {
         App()->getClientScript()->registerPackage('jquery-tablesorter');
-        App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'users.js');
+        App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . 'users.js');
         $postuserid = (int) Yii::app()->request->getPost("uid");
         $aData['postuser']  = flattenText(Yii::app()->request->getPost("user"));
         $aData['postemail'] = flattenText(Yii::app()->request->getPost("email"));
diff --git a/protected/core/Survey_Common_Action.php b/protected/core/Survey_Common_Action.php
index 25463ce470a..978ba6efee1 100644
--- a/protected/core/Survey_Common_Action.php
+++ b/protected/core/Survey_Common_Action.php
@@ -282,15 +282,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
             }
         }
 
-        if (!empty($aData['display']['menu_bars']['browse']) && !empty($aData['surveyid']))
-        {
-            $this->_browsemenubar($aData['surveyid'], $aData['display']['menu_bars']['browse']);
-        }
 
-        if (!empty($aData['display']['menu_bars']['user_group']))
-        {
-            $this->_userGroupBar(!empty($aData['ugid']) ? $aData['ugid'] : 0);
-        }
 
         // Load views
         foreach ($aViewUrls as $sViewKey => $viewUrl)
diff --git a/protected/core/WebApplication.php b/protected/core/WebApplication.php
index 526f944f7e0..73841816714 100644
--- a/protected/core/WebApplication.php
+++ b/protected/core/WebApplication.php
@@ -179,28 +179,6 @@ public function setConfig($name, $value)
         $this->config[$name] = $value;
     }
 
-    /**
-     * Set a 'flash message'.
-     *
-     * A flahs message will be shown on the next request and can contain a message
-     * to tell that the action was successful or not. The message is displayed and
-     * cleared when it is shown in the view using the widget:
-     * <code>
-     * $this->widget('application.extensions.FlashMessage.FlashMessage');
-     * </code>
-     *
-     * @param string $message
-     * @param string $type
-     * @return WebApplication Provides a fluent interface
-     */
-    public function setFlashMessage($message,$type='default')
-    {
-        $aFlashMessage=$this->session['aFlashMessage'];
-        $aFlashMessage[]=array('message'=>$message,'type'=>$type);
-        $this->session['aFlashMessage'] = $aFlashMessage;
-        return $this;
-    }
-
     /**
     * Loads a config from a file
     *
@@ -228,6 +206,9 @@ public function loadConfig($file)
     */
     public function getConfig($name, $default = false)
     {
+        if ($name == 'adminstyleurl') {
+            return $this->getPublicUrl() . '/styles/gringegreen/';
+        }
         return isset($this->config[$name]) ? $this->config[$name] : $default;
     }
 
diff --git a/protected/extensions/LimeScript/LimeScript.php b/protected/extensions/LimeScript/LimeScript.php
index f2e288aab49..aa04c0b16ce 100644
--- a/protected/extensions/LimeScript/LimeScript.php
+++ b/protected/extensions/LimeScript/LimeScript.php
@@ -14,7 +14,7 @@ public function run()
             
             $data = array();
             $data['baseUrl']                    = Yii::app()->getBaseUrl(true);
-            $data['public']                     = Yii::getPathOfAlias('public');
+            $data['public']                     = App()->getPublicUrl();
             $data['showScriptName']             = Yii::app()->urlManager->showScriptName;
             $data['urlFormat']                  = Yii::app()->urlManager->urlFormat;
             $data['adminImageUrl']              = Yii::app()->getConfig('adminimageurl');
diff --git a/protected/helpers/FrontEnd.php b/protected/helpers/FrontEnd.php
index 486b579540f..8881ba07684 100644
--- a/protected/helpers/FrontEnd.php
+++ b/protected/helpers/FrontEnd.php
@@ -13,7 +13,7 @@ public static function makegraph($step, $total)
         bp();
 
 
-        Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'lime-progress.css');
+        Yii::app()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . 'lime-progress.css');
         $size = intval(($step) / $total * 100);
 
         $graph = '<script type="text/javascript">
@@ -215,7 +215,7 @@ public static function sendSubmitNotifications($surveyid)
         $aReplacementVars['ADMINEMAIL'] = $thissurvey['adminemail'];
         $aReplacementVars['VIEWRESPONSEURL'] = Yii::app()->createAbsoluteUrl("/admin/responses/sa/view/surveyid/{$surveyid}/id/{$srid}");
         $aReplacementVars['EDITRESPONSEURL'] = Yii::app()->createAbsoluteUrl("/admin/dataentry/sa/editdata/subaction/edit/surveyid/{$surveyid}/id/{$srid}");
-        $aReplacementVars['STATISTICSURL'] = Yii::app()->createAbsoluteUrl("/admin/statistics/sa/index/surveyid/{$surveyid}");
+        $aReplacementVars['STATISTICSURL'] = Yii::app()->createAbsoluteUrl("admin/statistics", ['sa' => 'index', 'surveyid' => $surveyid]);
         if ($bIsHTML) {
             $aReplacementVars['VIEWRESPONSEURL'] = "<a href='{$aReplacementVars['VIEWRESPONSEURL']}'>{$aReplacementVars['VIEWRESPONSEURL']}</a>";
             $aReplacementVars['EDITRESPONSEURL'] = "<a href='{$aReplacementVars['EDITRESPONSEURL']}'>{$aReplacementVars['EDITRESPONSEURL']}</a>";
diff --git a/protected/helpers/Replacements.php b/protected/helpers/Replacements.php
index 54acb1da236..db45b14473f 100644
--- a/protected/helpers/Replacements.php
+++ b/protected/helpers/Replacements.php
@@ -89,7 +89,7 @@ public static function templatereplace(
             } elseif (file_exists($templateDir . DIRECTORY_SEPARATOR . 'jquery-ui.css')) {
                 $clientScript->registerCssFile("{$templateUrl}jquery-ui.css");
             } else {
-                $clientScript->registerCssFile(Yii::app()->getConfig('publicstyleurl') . "jquery-ui.css");
+                $clientScript->registerCssFile(App()->publicUrl . '/styles-public/' . "jquery-ui.css");
             }
 
             $clientScript->registerCssFile("{$templateUrl}template.css");
diff --git a/protected/helpers/SurveyTranslator.php b/protected/helpers/SurveyTranslator.php
index cdecbdeb33c..823e76bbb94 100644
--- a/protected/helpers/SurveyTranslator.php
+++ b/protected/helpers/SurveyTranslator.php
@@ -1,348 +1,351 @@
 <?php
 
-    namespace ls\helpers;
-    class SurveyTranslator
-    {
 
-        public static function getDateFormatData($iDateFormat = 0)
-        {
-            $aDateFormats = array(
-                1 => array('phpdate' => 'd.m.Y', 'jsdate' => 'dd.mm.yy', 'dateformat' => gT('dd.mm.yyyy')),
-                2 => array('phpdate' => 'd-m-Y', 'jsdate' => 'dd-mm-yy', 'dateformat' => gT('dd-mm-yyyy')),
-                3 => array('phpdate' => 'Y.m.d', 'jsdate' => 'yy.mm.dd', 'dateformat' => gT('yyyy.mm.dd')),
-                4 => array('phpdate' => 'j.n.Y', 'jsdate' => 'd.m.yy', 'dateformat' => gT('d.m.yyyy')),
-                5 => array('phpdate' => 'd/m/Y', 'jsdate' => 'dd/mm/yy', 'dateformat' => gT('dd/mm/yyyy')),
-                6 => array('phpdate' => 'Y-m-d', 'jsdate' => 'yy-mm-dd', 'dateformat' => gT('yyyy-mm-dd')),
-                7 => array('phpdate' => 'Y/m/d', 'jsdate' => 'yy/mm/dd', 'dateformat' => gT('yyyy/mm/dd')),
-                8 => array('phpdate' => 'j/n/Y', 'jsdate' => 'd/m/yy', 'dateformat' => gT('d/m/yyyy')),
-                9 => array('phpdate' => 'm-d-Y', 'jsdate' => 'mm-dd-yy', 'dateformat' => gT('mm-dd-yyyy')),
-                10 => array('phpdate' => 'm.d.Y', 'jsdate' => 'mm.dd.yy', 'dateformat' => gT('mm.dd.yyyy')),
-                11 => array('phpdate' => 'm/d/Y', 'jsdate' => 'mm/dd/yy', 'dateformat' => gT('mm/dd/yyyy')),
-                12 => array('phpdate' => 'j-n-Y', 'jsdate' => 'd-m-yy', 'dateformat' => gT('d-m-yyyy'))
-            );
-
-            if ($iDateFormat > 12 || $iDateFormat < 0) {
-                $iDateFormat = 11;   // TODO - what should default be?
-            }
-            if ($iDateFormat > 0) {
-                return $aDateFormats[$iDateFormat];
-            } else {
-                return $aDateFormats;
-            }
+namespace ls\helpers;
+
+use \Yii;
+class SurveyTranslator
+{
 
+    public static function getDateFormatData($iDateFormat = 0)
+    {
+        $aDateFormats = array(
+            1 => array('phpdate' => 'd.m.Y', 'jsdate' => 'dd.mm.yy', 'dateformat' => gT('dd.mm.yyyy')),
+            2 => array('phpdate' => 'd-m-Y', 'jsdate' => 'dd-mm-yy', 'dateformat' => gT('dd-mm-yyyy')),
+            3 => array('phpdate' => 'Y.m.d', 'jsdate' => 'yy.mm.dd', 'dateformat' => gT('yyyy.mm.dd')),
+            4 => array('phpdate' => 'j.n.Y', 'jsdate' => 'd.m.yy', 'dateformat' => gT('d.m.yyyy')),
+            5 => array('phpdate' => 'd/m/Y', 'jsdate' => 'dd/mm/yy', 'dateformat' => gT('dd/mm/yyyy')),
+            6 => array('phpdate' => 'Y-m-d', 'jsdate' => 'yy-mm-dd', 'dateformat' => gT('yyyy-mm-dd')),
+            7 => array('phpdate' => 'Y/m/d', 'jsdate' => 'yy/mm/dd', 'dateformat' => gT('yyyy/mm/dd')),
+            8 => array('phpdate' => 'j/n/Y', 'jsdate' => 'd/m/yy', 'dateformat' => gT('d/m/yyyy')),
+            9 => array('phpdate' => 'm-d-Y', 'jsdate' => 'mm-dd-yy', 'dateformat' => gT('mm-dd-yyyy')),
+            10 => array('phpdate' => 'm.d.Y', 'jsdate' => 'mm.dd.yy', 'dateformat' => gT('mm.dd.yyyy')),
+            11 => array('phpdate' => 'm/d/Y', 'jsdate' => 'mm/dd/yy', 'dateformat' => gT('mm/dd/yyyy')),
+            12 => array('phpdate' => 'j-n-Y', 'jsdate' => 'd-m-yy', 'dateformat' => gT('d-m-yyyy'))
+        );
+
+        if ($iDateFormat > 12 || $iDateFormat < 0) {
+            $iDateFormat = 11;   // TODO - what should default be?
+        }
+        if ($iDateFormat > 0) {
+            return $aDateFormats[$iDateFormat];
+        } else {
+            return $aDateFormats;
         }
 
-        public static function getLanguageData($bOrderByNative = false, $sLanguageCode = 'en')
-        {
-            $supportedLanguages = App()->getLocale()->data();
+    }
 
-            if ($bOrderByNative) {
-                $supportedLanguages = \Cake\Utility\Hash::sort($supportedLanguages, 'nativedescription');
-            } else {
-                $supportedLanguages = \Cake\Utility\Hash::sort($supportedLanguages, 'description');
-            }
+    public static function getLanguageData($bOrderByNative = false, $sLanguageCode = 'en')
+    {
+        $supportedLanguages = App()->getLocale()->data();
 
-            return $supportedLanguages;
+        if ($bOrderByNative) {
+            $supportedLanguages = \Cake\Utility\Hash::sort($supportedLanguages, 'nativedescription');
+        } else {
+            $supportedLanguages = \Cake\Utility\Hash::sort($supportedLanguages, 'description');
         }
 
+        return $supportedLanguages;
+    }
 
-        /**
-         *  Returns avaliable formats for Radix Points (Decimal Separators) or returns
-         *  radix point info about a specific format.
-         *
-         * @param int $format Format ID/Number [optional]
-         */
-        public static function getRadixPointData($format = -1)
-        {
-            $aRadixFormats = array(
-                0 => array('separator' => '.', 'desc' => gT('Dot (.)')),
-                1 => array('separator' => ',', 'desc' => gT('Comma (,)'))
-            );
-
-            // hack for fact that null sometimes sent to this function
-            if (is_null($format)) {
-                $format = 0;
-            }
 
-            if ($format >= 0) {
-                return $aRadixFormats[$format];
-            } else {
-                return $aRadixFormats;
-            }
+    /**
+     *  Returns avaliable formats for Radix Points (Decimal Separators) or returns
+     *  radix point info about a specific format.
+     *
+     * @param int $format Format ID/Number [optional]
+     */
+    public static function getRadixPointData($format = -1)
+    {
+        $aRadixFormats = array(
+            0 => array('separator' => '.', 'desc' => gT('Dot (.)')),
+            1 => array('separator' => ',', 'desc' => gT('Comma (,)'))
+        );
+
+        // hack for fact that null sometimes sent to this function
+        if (is_null($format)) {
+            $format = 0;
         }
 
+        if ($format >= 0) {
+            return $aRadixFormats[$format];
+        } else {
+            return $aRadixFormats;
+        }
+    }
 
-        /**
-         * Convert a 'dateformat' format string to a 'phpdate' format.
-         *
-         * @param $sDateformat string
-         * @returns string
-         *
-         */
-        public static function getPHPDateFromDateFormat($sDateformat)
-        {
-            // Note that order is relevant (longer strings first)
-            $aFmts = array(
-                // With leading zero
-                "dd" => "d",
-                "mm" => "m",
-                "yyyy" => "Y",
-                "HH" => "H",
-                "MM" => "i",
-                // Without leading zero
-                "d" => "j",
-                "m" => "n",
-                "yy" => "y",
-                "H" => "G",
-                "M" => "i"
-            );
-
-            // Extra allowed characters
-            $aAllowed = array('-', '.', '/', ':', ' ');
-
-            // Convert
-            $tmp = [];
-            foreach ($aAllowed as $k) {
-                $tmp[$k] = true;
-            }
-            foreach (array_values($aFmts) as $k) {
-                for ($i = 0; $i < strlen($k); $i++) {
-                    $tmp[$k[$i]] = true;
-                }
+
+    /**
+     * Convert a 'dateformat' format string to a 'phpdate' format.
+     *
+     * @param $sDateformat string
+     * @returns string
+     *
+     */
+    public static function getPHPDateFromDateFormat($sDateformat)
+    {
+        // Note that order is relevant (longer strings first)
+        $aFmts = array(
+            // With leading zero
+            "dd" => "d",
+            "mm" => "m",
+            "yyyy" => "Y",
+            "HH" => "H",
+            "MM" => "i",
+            // Without leading zero
+            "d" => "j",
+            "m" => "n",
+            "yy" => "y",
+            "H" => "G",
+            "M" => "i"
+        );
+
+        // Extra allowed characters
+        $aAllowed = array('-', '.', '/', ':', ' ');
+
+        // Convert
+        $tmp = [];
+        foreach ($aAllowed as $k) {
+            $tmp[$k] = true;
+        }
+        foreach (array_values($aFmts) as $k) {
+            for ($i = 0; $i < strlen($k); $i++) {
+                $tmp[$k[$i]] = true;
             }
-            $aAllowed = $tmp;
-
-            $tmp = strtr($sDateformat, $aFmts);
-            $sPhpdate = "";
-            for ($i = 0; $i < strlen($tmp); $i++) {
-                $c = $tmp[$i];
-                if (isset($aAllowed[$c])) {
-                    $sPhpdate .= $c;
-                }
+        }
+        $aAllowed = $tmp;
+
+        $tmp = strtr($sDateformat, $aFmts);
+        $sPhpdate = "";
+        for ($i = 0; $i < strlen($tmp); $i++) {
+            $c = $tmp[$i];
+            if (isset($aAllowed[$c])) {
+                $sPhpdate .= $c;
             }
-
-            return $sPhpdate;
         }
 
+        return $sPhpdate;
+    }
 
-        /**
-         * Convert a 'dateformat' format string to a 'jsdate' format.
-         *
-         * @param $sDateformat string
-         * @returns string
-         *
-         */
-        public static function getJSDateFromDateFormat($sDateformat)
-        {
-            // The only difference from dateformat is that Jsdate does not support truncated years
-            return str_replace(array('yy'), array('y'), $sDateformat);
-        }
 
+    /**
+     * Convert a 'dateformat' format string to a 'jsdate' format.
+     *
+     * @param $sDateformat string
+     * @returns string
+     *
+     */
+    public static function getJSDateFromDateFormat($sDateformat)
+    {
+        // The only difference from dateformat is that Jsdate does not support truncated years
+        return str_replace(array('yy'), array('y'), $sDateformat);
+    }
 
-        /**
-         * Get the date format for a specified survey
-         *
-         * @param $surveyid integer ls\models\Survey id
-         * @param $languagecode string ls\models\Survey language code (optional)
-         * @returns integer
-         *
-         */
-        public static function getDateFormatForSID($surveyid, $languagecode = '')
-        {
-            if (!isset($languagecode) || $languagecode == '') {
-                $languagecode = Survey::model()->findByPk($surveyid)->language;
-            }
-            $data = SurveyLanguageSetting::model()->getDateFormat($surveyid, $languagecode);
 
-            if (empty($data)) {
-                $dateformat = 0;
-            } else {
-                $dateformat = (int)$data;
-            }
+    /**
+     * Get the date format for a specified survey
+     *
+     * @param $surveyid integer ls\models\Survey id
+     * @param $languagecode string ls\models\Survey language code (optional)
+     * @returns integer
+     *
+     */
+    public static function getDateFormatForSID($surveyid, $languagecode = '')
+    {
+        if (!isset($languagecode) || $languagecode == '') {
+            $languagecode = Survey::model()->findByPk($surveyid)->language;
+        }
+        $data = SurveyLanguageSetting::model()->getDateFormat($surveyid, $languagecode);
 
-            return (int)$dateformat;
+        if (empty($data)) {
+            $dateformat = 0;
+        } else {
+            $dateformat = (int)$data;
         }
 
+        return (int)$dateformat;
+    }
 
-        /**
-         * Check whether we can show the JS date picker with the current format
-         *
-         * @param $dateformatdetails array Date format details for the question
-         * @param $dateformats array Available date formats
-         * @returns integer
-         *
-         */
-        public static function canShowDatePicker($dateformatdetails, $dateformats = null)
-        {
-            if (is_null($dateformats)) {
-                $dateformats = getDateFormatData();
-            }
-            $showpicker = false;
-            foreach ($dateformats as $format) {
-                if ($format['jsdate'] == $dateformatdetails['jsdate']) {
-                    $showpicker = true;
-                    break;
-                }
-            }
 
-            return $showpicker;
+    /**
+     * Check whether we can show the JS date picker with the current format
+     *
+     * @param $dateformatdetails array Date format details for the question
+     * @param $dateformats array Available date formats
+     * @returns integer
+     *
+     */
+    public static function canShowDatePicker($dateformatdetails, $dateformats = null)
+    {
+        if (is_null($dateformats)) {
+            $dateformats = getDateFormatData();
         }
-
-
-        public static function getLanguageCodefromLanguage($languagetosearch)
-        {
-            $detaillanguages = self::getLanguageData(false, Yii::app()->session['adminlang']);
-            foreach ($detaillanguages as $key2 => $languagename) {
-                if ($languagetosearch == $languagename['description']) {
-                    return $key2;
-                }
+        $showpicker = false;
+        foreach ($dateformats as $format) {
+            if ($format['jsdate'] == $dateformatdetails['jsdate']) {
+                $showpicker = true;
+                break;
             }
-
-            // else return default en code
-            return "en";
         }
 
+        return $showpicker;
+    }
 
-        public static function getLanguageNameFromCode($codetosearch, $withnative = true, $sTranslationLanguage = null)
-        {
-            if (is_null($sTranslationLanguage)) {
-                $sTranslationLanguage = Yii::app()->session['adminlang'];
-            }
-            $detaillanguages = self::getLanguageData(false, $sTranslationLanguage);
-            if (isset($detaillanguages[$codetosearch]['description'])) {
-                if ($withnative) {
-                    return array(
-                        $detaillanguages[$codetosearch]['description'],
-                        $detaillanguages[$codetosearch]['nativedescription']
-                    );
-                } else {
-                    return $detaillanguages[$codetosearch]['description'];
-                }
-            } else // else return default en code
-            {
-                return false;
+
+    public static function getLanguageCodefromLanguage($languagetosearch)
+    {
+        $detaillanguages = self::getLanguageData(false, Yii::app()->session['adminlang']);
+        foreach ($detaillanguages as $key2 => $languagename) {
+            if ($languagetosearch == $languagename['description']) {
+                return $key2;
             }
         }
 
+        // else return default en code
+        return "en";
+    }
 
-        public static function getLanguageRTL($sLanguageCode)
-        {
-            $aLanguageData = self::getLanguageData(false, $sLanguageCode);
-            if (isset($aLanguageData[$sLanguageCode]['rtl'])) {
-                return $aLanguageData[$sLanguageCode]['rtl'];
-            } else {
-                return false;
-            }
-        }
 
-        /**
-         * Returns the locale settings for a certain language code
-         *
-         * @param string $codetosearch
-         * @return array Array with locale details
-         *
-         */
-        public static function getLanguageDetails($codetosearch)
-        {
-            $detaillanguages = self::getLanguageData(false, Yii::app()->session['adminlang']);
-            if (isset($detaillanguages[$codetosearch])) {
-                return $detaillanguages[$codetosearch];
+    public static function getLanguageNameFromCode($codetosearch, $withnative = true, $sTranslationLanguage = null)
+    {
+        if (is_null($sTranslationLanguage)) {
+            $sTranslationLanguage = Yii::app()->session['adminlang'];
+        }
+        $detaillanguages = self::getLanguageData(false, $sTranslationLanguage);
+        if (isset($detaillanguages[$codetosearch]['description'])) {
+            if ($withnative) {
+                return array(
+                    $detaillanguages[$codetosearch]['description'],
+                    $detaillanguages[$codetosearch]['nativedescription']
+                );
             } else {
-                return $detaillanguages['en'];
+                return $detaillanguages[$codetosearch]['description'];
             }
+        } else // else return default en code
+        {
+            return false;
         }
+    }
 
-        /**
-         * This functions translates LimeSurvey specific locale code to match a Yii locale
-         *
-         * @param mixed $sLocale LimeSurvey locale code
-         */
-        public static function translateLStoYiiLocale($sLocale)
-        {
-            // Strip informal string
-            $sLocale = str_replace('-informal', '', $sLocale);
 
-            return $sLocale;
+    public static function getLanguageRTL($sLanguageCode)
+    {
+        $aLanguageData = self::getLanguageData(false, $sLanguageCode);
+        if (isset($aLanguageData[$sLanguageCode]['rtl'])) {
+            return $aLanguageData[$sLanguageCode]['rtl'];
+        } else {
+            return false;
         }
+    }
 
-        public static function getLanguageDataRestricted($bOrderByNative = false, $sLanguageCode = 'en')
-        {
-            $aLanguageData = self::getLanguageData($bOrderByNative, $sLanguageCode);
-            $result = [];
+    /**
+     * Returns the locale settings for a certain language code
+     *
+     * @param string $codetosearch
+     * @return array Array with locale details
+     *
+     */
+    public static function getLanguageDetails($codetosearch)
+    {
+        $detaillanguages = self::getLanguageData(false, Yii::app()->session['adminlang']);
+        if (isset($detaillanguages[$codetosearch])) {
+            return $detaillanguages[$codetosearch];
+        } else {
+            return $detaillanguages['en'];
+        }
+    }
 
-            $activeLanguages = SettingGlobal::get('restrictToLanguages');
+    /**
+     * This functions translates LimeSurvey specific locale code to match a Yii locale
+     *
+     * @param mixed $sLocale LimeSurvey locale code
+     */
+    public static function translateLStoYiiLocale($sLocale)
+    {
+        // Strip informal string
+        $sLocale = str_replace('-informal', '', $sLocale);
 
-            if (!empty($activeLanguages)) {
-                foreach ($activeLanguages as $language) {
-                    $result[$language] = $aLanguageData[$language];
-                }
-            } else {
-                $result = $aLanguageData;
-            }
+        return $sLocale;
+    }
+
+    public static function getLanguageDataRestricted($bOrderByNative = false, $sLanguageCode = 'en')
+    {
+        $aLanguageData = self::getLanguageData($bOrderByNative, $sLanguageCode);
+        $result = [];
 
-            return $result;
+        $activeLanguages = SettingGlobal::get('restrictToLanguages');
+
+        if (!empty($activeLanguages)) {
+            foreach ($activeLanguages as $language) {
+                $result[$language] = $aLanguageData[$language];
+            }
+        } else {
+            $result = $aLanguageData;
         }
 
+        return $result;
+    }
 
-        public static function userSort($a, $b)
-        {
 
-            // smarts is all-important, so sort it first
-            if ($a['description'] > $b['description']) {
-                return 1;
-            } else {
-                return -1;
-            }
+    public static function userSort($a, $b)
+    {
+
+        // smarts is all-important, so sort it first
+        if ($a['description'] > $b['description']) {
+            return 1;
+        } else {
+            return -1;
         }
+    }
 
 
-        public static function userSortNative($a, $b)
-        {
+    public static function userSortNative($a, $b)
+    {
 
-            // smarts is all-important, so sort it first
-            if ($a['nativedescription'] > $b['nativedescription']) {
-                return 1;
-            } else {
-                return -1;
-            }
+        // smarts is all-important, so sort it first
+        if ($a['nativedescription'] > $b['nativedescription']) {
+            return 1;
+        } else {
+            return -1;
         }
+    }
 
 
-        /**
-         * This public static function  support the ability NOT to reverse numbers (for example when you output
-         * a phrase as a parameter for a SWF file that can't handle RTL languages itself, but
-         * obviously any numbers should remain the same as in the original phrase).
-         * Note that it can be used just as well for UTF-8 usages if you want the numbers to remain intact
-         *
-         * @param string $str
-         * @param boolean $reverse_numbers
-         * @return string
-         */
-        public static function UTF8Strrev($str, $reverse_numbers = false)
-        {
-            preg_match_all('/./us', $str, $ar);
-            if ($reverse_numbers) {
-                return join('', array_reverse($ar[0]));
-            } else {
-                $temp = [];
-                foreach ($ar[0] as $value) {
-                    if (is_numeric($value) && !empty($temp[0]) && is_numeric($temp[0])) {
-                        foreach ($temp as $key => $value2) {
-                            if (is_numeric($value2)) {
-                                $pos = ($key + 1);
-                            } else {
-                                break;
-                            }
+    /**
+     * This public static function  support the ability NOT to reverse numbers (for example when you output
+     * a phrase as a parameter for a SWF file that can't handle RTL languages itself, but
+     * obviously any numbers should remain the same as in the original phrase).
+     * Note that it can be used just as well for UTF-8 usages if you want the numbers to remain intact
+     *
+     * @param string $str
+     * @param boolean $reverse_numbers
+     * @return string
+     */
+    public static function UTF8Strrev($str, $reverse_numbers = false)
+    {
+        preg_match_all('/./us', $str, $ar);
+        if ($reverse_numbers) {
+            return join('', array_reverse($ar[0]));
+        } else {
+            $temp = [];
+            foreach ($ar[0] as $value) {
+                if (is_numeric($value) && !empty($temp[0]) && is_numeric($temp[0])) {
+                    foreach ($temp as $key => $value2) {
+                        if (is_numeric($value2)) {
+                            $pos = ($key + 1);
+                        } else {
+                            break;
                         }
-                        $temp2 = array_splice($temp, $pos);
-                        $temp = array_merge($temp, array($value), $temp2);
-                    } else {
-                        array_unshift($temp, $value);
                     }
+                    $temp2 = array_splice($temp, $pos);
+                    $temp = array_merge($temp, array($value), $temp2);
+                } else {
+                    array_unshift($temp, $value);
                 }
-
-                return implode('', $temp);
             }
-        }
 
+            return implode('', $temp);
+        }
     }
+
+}
diff --git a/protected/helpers/admin/statistics_helper.php b/protected/helpers/admin/statistics_helper.php
index 25b5f132376..f1ce5cf8c57 100644
--- a/protected/helpers/admin/statistics_helper.php
+++ b/protected/helpers/admin/statistics_helper.php
@@ -14,7 +14,6 @@
 use ls\models\Survey;
 use ls\models\SurveyDynamic;
 
-
 /**
 *
 *  Generate a chart for a question
@@ -80,8 +79,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
         {
             $graph = new pChart(690,200);
             $graph->loadColorPalette($homedir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal');
-            $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
-            $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
+            $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
+            $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
             $graph->drawTitle(0,0,gT('Sorry, but this question has too many answer options to be shown properly in a graph.','unescaped'),30,30,30,690,200);
             $cache->WriteToCache("graph".$iSurveyID.$sLanguageCode.$iQuestionID,$DataSet,$graph);
             $cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$sLanguageCode.$iQuestionID,$DataSet));
@@ -99,8 +98,8 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
         {
             $graph = new pChart(690,200);
             $graph->loadColorPalette($homedir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal');
-            $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
-            $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
+            $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
+            $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
             $graph->drawTitle(0,0,gT('Sorry, but this question has no responses yet so a graph cannot be shown.','unescaped'),30,30,30,690,200);
             $cache->WriteToCache("graph".$iSurveyID.$sLanguageCode.$iQuestionID,$DataSet,$graph);
             $cachefilename=basename($cache->GetFileFromCache("graph".$iSurveyID.$sLanguageCode.$iQuestionID,$DataSet));
@@ -142,13 +141,13 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
 
         if (!$type) // Bar chart
         {
-            $DataSet = new pData;
+            $DataSet = new pData();
             $counter=0;
             $maxyvalue=0;
             foreach ($grawdata as $datapoint)
             {
-                $DataSet->AddPoint(array($datapoint),"Serie$counter");
-                $DataSet->AddSerie("Serie$counter");
+                $DataSet->addPoint([$datapoint],"Serie$counter");
+                $DataSet->addSerie("Serie$counter");
 
                 $counter++;
                 if ($datapoint>$maxyvalue) $maxyvalue=$datapoint;
@@ -173,7 +172,7 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
             $counter=0;
             foreach ($lblout as $sLabelName)
             {
-                $DataSet->SetSerieName(html_entity_decode($sLabelName,null,'UTF-8'), "Serie$counter");
+                $DataSet->setSerieName(html_entity_decode($sLabelName,null,'UTF-8'), "Serie$counter");
                 $counter++;
             }
 
@@ -182,30 +181,33 @@ function createChart($iQuestionID, $iSurveyID, $type=null, $lbl, $gdata, $grawda
             }
             else
             {
-                $graph = new pChart(1,1);
-                $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize);
-                $legendsize=$graph->getLegendBoxSize($DataSet->GetDataDescription());
-
-                if ($legendsize[1]<320) $gheight=420; else $gheight=$legendsize[1]+100;
-                $graph = new pChart(690+$legendsize[0],$gheight);
-                $graph->drawFilledRectangle(0,0,690+$legendsize[0],$gheight,254,254,254,false);
-                $graph->loadColorPalette($homedir.DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$admintheme.DIRECTORY_SEPARATOR.'limesurvey.pal');
-                $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
+                $graph = new pChart(1, 1);
+                $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
+                $legendsize = $graph->getLegendBoxSize($DataSet->getData());
+                if ($legendsize['Height'] < 320) {
+                    $gheight=420;
+                }  else {
+                    $gheight = $legendsize['Height'] + 100;
+                }
+                $graph = new pChart(690+$legendsize['Width'],$gheight);
+                $graph->drawFilledRectangle(0,0,690 + $legendsize['Width'],$gheight,254,254,254,false);
+                $graph->loadColorPalette(App()->theme->basePath . '/assets/limesurvey.pal');
+                $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
                 $graph->setGraphArea(50,30,500,$gheight-60);
-                $graph->drawFilledRoundedRectangle(7,7,523+$legendsize[0],$gheight-7,5,254,255,254);
-                $graph->drawRoundedRectangle(5,5,525+$legendsize[0],$gheight-5,5,230,230,230);
+                $graph->drawFilledRoundedRectangle(7,7,523+$legendsize['Width'],$gheight-7,5,254,255,254);
+                $graph->drawRoundedRectangle(5,5,525+$legendsize['Width'],$gheight-5,5,230,230,230);
                 $graph->drawGraphArea(254,254,254,TRUE);
                 $graph->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,150,150,150,TRUE,90,0,TRUE,5,false);
                 $graph->drawGrid(4,TRUE,230,230,230,50);
                 // Draw the 0 line
-                $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile,$chartfontsize);
+                $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile,$chartfontsize);
                 $graph->drawTreshold(0,143,55,72,TRUE,TRUE);
 
                 // Draw the bar graph
                 $graph->drawBarGraph($DataSet->GetData(),$DataSet->GetDataDescription(),FALSE);
                 //$Test->setLabel($DataSet->GetData(),$DataSet->GetDataDescription(),"Serie4","1","Important point!");
                 // Finish the graph
-                $graph->setFontProperties($rootdir.DIRECTORY_SEPARATOR.'fonts'.DIRECTORY_SEPARATOR.$chartfontfile, $chartfontsize);
+                $graph->setFontProperties(\Yii::getPathOfAlias('webroot') . '/fonts/' . $chartfontfile, $chartfontsize);
                 $graph->drawLegend(510,30,$DataSet->GetDataDescription(),250,250,250);
 
                 $cache->WriteToCache("graph".$iSurveyID.$sLanguageCode.$iQuestionID,$DataSet->GetData(),$graph);
@@ -329,11 +331,10 @@ function buildSelects($allfields, $surveyid, $language) {
     $selects=[];
     $aQuestionMap=[];
 
-    $fieldmap=createFieldMap($surveyid, "full", false, false, $language);
-    foreach ($fieldmap as $field)
+
+    foreach (Survey::model()->findByPk($surveyid)->questions as $question)
     {
-        if(isset($field['qid']) && $field['qid']!='')
-            $aQuestionMap[]=$field['sid'].'X'.$field['gid'].'X'.$field['qid'];
+        $aQuestionMap[] = $question->sgqa;
     }
 
     // creates array of post variable names
@@ -603,13 +604,16 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
         $qtitle="";
         $qquestion="";
         $qtype="";
-        $statlang = $oLanguage;
         $firstletter = substr($rt, 0, 1);
-        $fieldmap=createFieldMap($surveyid, "full", false, false, $language);
+
         $sDatabaseType = Yii::app()->db->getDriverName();
         $statisticsoutput="";
         $qqid = "";
 
+        if (preg_match("/^.*{$surveyid}X(?<gid>\d+)X(?<qid>\d+)$/", $rt, $matches)) {
+            $qid = $matches['qid'];
+        }
+
         /* Some variable depend on output type, actually : only line feed */
         switch($outputType)
         {
@@ -661,13 +665,12 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
         elseif ($firstletter == "T" || $firstletter == "S") //Short and long text
         {
             //search for key
-            $fld = substr($rt, 1, strlen($rt));
-            $fielddata=$fieldmap[$fld];
+            $sgq = substr($rt, 1, strlen($rt));
 
             list($qanswer, $qlid)=!empty($fielddata['aid']) ? explode("_", $fielddata['aid']) : array("", "");
 
             //get question data
-            $nresult = Question::model()->find('language=:language AND parent_qid=0 AND qid=:qid', array(':language'=>$language, ':qid'=>$fielddata['qid']));
+            $nresult = Question::model()->findByPk($qid);
             $qtitle=$nresult->title;
             $qtype=$nresult->type;
             $qquestion=flattenText($nresult->question);
@@ -1437,7 +1440,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
                     // Using previously defined $surveylanguagecodes array of language codes
                     foreach ($surveylanguagecodes as $availlang)
                     {
-                        $alist[]=array($availlang, getLanguageNameFromCode($availlang,false));
+                        $alist[]=array($availlang, \ls\helpers\SurveyTranslator::getLanguageNameFromCode($availlang,false));
                     }
                     break;
 
@@ -1575,14 +1578,13 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
         $TotalCompleted = 0; //Count of actually completed answers
         $statisticsoutput="";
         $sDatabaseType = Yii::app()->db->getDriverName();
-        $tempdir = Yii::app()->getConfig("tempdir");
+        $tempdir = App()->getRuntimePath();
         $tempurl = Yii::app()->getConfig("tempurl");
         $firstletter = substr($rt, 0, 1);
         $astatdata=[];
 
-        if ($usegraph==1)
-        {
-            $MyCache = new pCache($tempdir.'/');
+        if (preg_match("/^.*{$surveyid}X(?<gid>\d+)X(?<qid>\d+)$/", $rt, $matches)) {
+            $qid = $matches['qid'];
         }
 
         switch($outputType)
@@ -2654,13 +2656,10 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
 
 
         //-------------------------- PCHART OUTPUT ----------------------------
-        list($qsid, $qgid, $qqid) = explode("X", $rt, 3);
-        $qsid = $surveyid;
-        $aattr = \ls\models\QuestionAttribute::model()->getQuestionAttributes($outputs['parentqid'], substr($rt, 0, 1));
-
+        $question = Question::model()->findByPk($qid);
         //PCHART has to be enabled and we need some data
         if ($usegraph == 1) {
-            $bShowGraph = $aattr["statistics_showgraph"] == "1";
+            $bShowGraph = $question->statistics_showgraph;
             $bAllowPieChart = ($outputs['qtype'] != "M" && $outputs['qtype'] != "P");
             $bAllowMap = (isset($aattr["location_mapservice"]) && $aattr["location_mapservice"] == "1");
             $bShowMap = ($bAllowMap && $aattr["statistics_showmap"] == "1");
@@ -2685,7 +2684,7 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
 
             if ($bShowGraph == true)
             {
-                $cachefilename = createChart($qqid, $qsid, $bShowPieChart, $lbl, $gdata, $grawdata, $MyCache, $sLanguage, $outputs['qtype']);
+                $cachefilename = createChart($qid, $surveyid, $bShowPieChart, $lbl, $gdata, $grawdata, new pCache($tempdir.'/'), $sLanguage, $outputs['qtype']);
                 if($cachefilename) // Add the image only if constructed
                 {
                     //introduce new counter
@@ -2809,8 +2808,6 @@ public function generate_statistics($surveyid, $allfields, $q2show='all', $usegr
         $surveylanguagecodes = Survey::model()->findByPk($surveyid)->additionalLanguages;
         $surveylanguagecodes[] = Survey::model()->findByPk($surveyid)->language;
 
-        $fieldmap=createFieldMap($surveyid, "full", false, false, $sLanguageCode);
-
         // Set language for questions and answers to base language of this survey
         $language=$sLanguageCode;
 
@@ -3082,13 +3079,8 @@ public function generate_statistics($surveyid, $allfields, $q2show='all', $usegr
 
         if (isset($summary) && $summary)
         {
-            //let's run through the survey
-            $runthrough=$summary;
-
-            //START Chop up fieldname and find matching questions
-
             //loop through all selected questions
-            foreach ($runthrough as $rt)
+            foreach ($summary as $rt)
             {
 
                 //Step 1: Get information about this response field (SGQA) for the summary
diff --git a/protected/helpers/common_helper.php b/protected/helpers/common_helper.php
index 397009bd909..6b33ea8e53f 100644
--- a/protected/helpers/common_helper.php
+++ b/protected/helpers/common_helper.php
@@ -3295,8 +3295,8 @@ function languageDropdown($surveyid,$selected)
     foreach ($slangs as $lang)
     {
         $link = Yii::app()->homeUrl.("/admin/dataentry/sa/view/surveyid/".$surveyid."/lang/".$lang);
-        if ($lang == $selected) $html .= "\t<option value='{$link}' selected='selected'>".getLanguageNameFromCode($lang,false)."</option>\n";
-        if ($lang != $selected) $html .= "\t<option value='{$link}'>".getLanguageNameFromCode($lang,false)."</option>\n";
+        if ($lang == $selected) $html .= "\t<option value='{$link}' selected='selected'>".\ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false)."</option>\n";
+        if ($lang != $selected) $html .= "\t<option value='{$link}'>".\ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false)."</option>\n";
     }
     $html .= "</select>";
     return $html;
@@ -3310,8 +3310,8 @@ function languageDropdownClean($surveyid,$selected)
     $html = "<select class='listboxquestions' id='language' name='language'>\n";
     foreach ($slangs as $lang)
     {
-        if ($lang == $selected) $html .= "\t<option value='$lang' selected='selected'>".getLanguageNameFromCode($lang,false)."</option>\n";
-        if ($lang != $selected) $html .= "\t<option value='$lang'>".getLanguageNameFromCode($lang,false)."</option>\n";
+        if ($lang == $selected) $html .= "\t<option value='$lang' selected='selected'>".\ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false)."</option>\n";
+        if ($lang != $selected) $html .= "\t<option value='$lang'>".\ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false)."</option>\n";
     }
     $html .= "</select>";
     return $html;
@@ -4494,7 +4494,7 @@ function getPrintableHeader()
     global $rooturl,$homeurl;
     $headelements = '
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <script type="text/javascript" src="'.Yii::app()->getConfig('adminscripts').'printablesurvey.js"></script>
+    <script type="text/javascript" src="'.App()->publicUrl . '/scripts/admin/'.'printablesurvey.js"></script>
     ';
     return $headelements;
 }
diff --git a/protected/helpers/qanda_helper.php b/protected/helpers/qanda_helper.php
index 1d33cf9e031..6bdb56840d0 100644
--- a/protected/helpers/qanda_helper.php
+++ b/protected/helpers/qanda_helper.php
@@ -51,7 +51,7 @@ function return_timer_script(Question $question, $ia, $disable=null) {
     global $thissurvey;
 
 
-    Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'coookies.js');
+    Yii::app()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/'.'coookies.js');
 
     /* End */
 
diff --git a/protected/models/Answer.php b/protected/models/Answer.php
index ba78ee14964..5ebffd4a863 100644
--- a/protected/models/Answer.php
+++ b/protected/models/Answer.php
@@ -194,7 +194,7 @@ function getAllRecords($condition, $order = false)
 
     public function getQuestionsForStatistics($fields, $condition, $orderby)
     {
-        return Yii::app()->db->createCommand()
+        return self::getDbConnection()->createCommand()
             ->select($fields)
             ->from(self::tableName())
             ->where($condition)
diff --git a/protected/models/Label.php b/protected/models/Label.php
index 562bfe7f9f7..b17abd592aa 100644
--- a/protected/models/Label.php
+++ b/protected/models/Label.php
@@ -12,18 +12,11 @@
  *
  *
  */
-
-use ls\models\ActiveRecord;
+namespace ls\models;
 
 class Label extends ActiveRecord
 {
-    /**
-     * Used for some statistical queries
-     * @var int
-     */
-    public $maxsortorder;
-
-	/**
+ 	/**
 	 * Returns the table's name
 	 *
 	 * @access public
@@ -42,20 +35,8 @@ public function tableName()
 	 */
 	public function primaryKey()
 	{
-		return array('lid', 'language');
+		return ['lid', 'language'];
 	}
-    /**
-    * Returns the static model of Settings table
-    *
-    * @static
-    * @access public
-    * @param string $class
-    * @return CActiveRecord
-    */
-    public static function model($class = __CLASS__)
-    {
-        return parent::model($class);
-    }
 
     /**
     * Returns this model's validation rules
@@ -63,18 +44,20 @@ public static function model($class = __CLASS__)
     */
     public function rules()
     {
-        return array(
-            array('lid','numerical', 'integerOnly'=>true),
-            array('code', 'unique', 'caseSensitive'=>true, 'criteria'=>array(
+        return [
+            ['lid', 'numerical', 'integerOnly'=>true],
+            [
+					'code', 'unique', 'caseSensitive'=>true, 'criteria'=> [
                             'condition'=>'lid = :lid AND language=:language',
-                            'params'=>array(':lid'=>$this->lid,':language'=>$this->language)
-                    ),
-                    'message'=>'{attribute} "{value}" is already in use.'),
-            array('title','required'),
-            array('sortorder','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
-            array('language','length', 'min' => 2, 'max'=>20),// in array languages ?
-            array('assessment_value','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
-        );
+                            'params'=> [':lid'=>$this->lid,':language'=>$this->language]
+			],
+                    'message'=>'{attribute} "{value}" is already in use.'
+			],
+            [['title', 'code'],'required'],
+            ['sortorder','numerical', 'integerOnly'=>true,'allowEmpty'=>true],
+            ['language','length', 'min' => 2, 'max'=>20],// in array languages ?
+            ['assessment_value','numerical', 'integerOnly'=>true,'allowEmpty'=>true],
+		];
     }
 
 
diff --git a/protected/models/LabelSet.php b/protected/models/LabelSet.php
index d9d29876113..4fea40414d3 100644
--- a/protected/models/LabelSet.php
+++ b/protected/models/LabelSet.php
@@ -16,73 +16,34 @@ public function tableName()
         return '{{labelsets}}';
     }
 
-    /**
-     * Returns the table's primary key
-     *
-     * @access public
-     * @return string
-     */
-    public function primaryKey()
-    {
-        return 'lid';
-    }
-
-    /**
-     * Returns the static model of Settings table
-     *
-     * @static
-     * @access public
-     * @param string $class
-     * @return CActiveRecord
-     */
-    public static function model($class = __CLASS__)
-    {
-        return parent::model($class);
-    }
-
     /**
      * Returns this model's validation rules
      *
      */
     public function rules()
     {
-        return array(
-            array('label_name', 'required'),
-            array('label_name', 'length', 'min' => 1, 'max' => 100),
-            array('label_name', 'required'),
-            array('languages', 'required'),
-            array('languages', 'required'),
-        );
+        return [
+            ['label_name', 'length', 'min' => 1, 'max' => 100],
+            ['label_name', 'required'],
+            ['languageArray', 'required'],
+        ];
     }
 
-    function getAllRecords($condition = false)
+    public function getLanguageArray()
     {
-        if ($condition != false) {
-            foreach ($condition as $item => $value) {
-                $criteria->addCondition($item . '="' . $value . '"');
-            }
-        }
-
-        $data = $this->findAll($criteria);
-
-        return $data;
+        return explode(',', $this->languages);
     }
-
-    function getLID()
+    public function setLanguageArray(array $value)
     {
-        return Yii::app()->db->createCommand()->select('lid')->order('lid asc')->from('{{labelsets}}')->query()->readAll();
+        $this->languages = implode(',', $value);
     }
 
-    function insertRecords($data)
+    public function relations()
     {
-        $lblset = new self;
-        foreach ($data as $k => $v) {
-            $lblset->$k = $v;
-        }
-        if ($lblset->save()) {
-            return $lblset->lid;
-        }
-
-        return false;
+        return [
+            'labels' => [self::HAS_MANY, Label::class, 'lid']
+        ];
     }
+
+
 }
diff --git a/protected/models/Question.php b/protected/models/Question.php
index 0fbdfdff699..5a548e26530 100644
--- a/protected/models/Question.php
+++ b/protected/models/Question.php
@@ -506,7 +506,7 @@ function updateQuestionOrder($gid, $language, $position = 0)
 
     public function getQuestionsForStatistics($fields, $condition, $orderby = false)
     {
-        $command = Yii::app()->db->createCommand()
+        $command = self::getDbConnection()->createCommand()
             ->select($fields)
             ->from(self::tableName())
             ->where($condition);
diff --git a/protected/models/forms/Settings.php b/protected/models/forms/Settings.php
index f01152fd663..a79a0a1dc5f 100644
--- a/protected/models/forms/Settings.php
+++ b/protected/models/forms/Settings.php
@@ -125,8 +125,8 @@ public function attributeLabels()
             'bounceencryption' => gT("Encryption type"),
             
             // Security
-            'surveyPreview_require_Auth' => gt("ls\models\Survey preview only for administration users"),
-            'filterxsshtml' => gt("ls\models\Survey preview only for administration users"),
+            'surveyPreview_require_Auth' => gt("Survey preview only for administration users"),
+            'filterxsshtml' => gt("Survey preview only for administration users"),
             'usercontrolSameGroupPolicy' => gt("Group member can only see own group"),
             'force_ssl' => gt("Force HTTPS"),
 
diff --git a/protected/models/questions/ShortTextQuestion.php b/protected/models/questions/ShortTextQuestion.php
index 6d86b4cbcb2..553d8599040 100644
--- a/protected/models/questions/ShortTextQuestion.php
+++ b/protected/models/questions/ShortTextQuestion.php
@@ -238,7 +238,7 @@ class=\"mapservice\" value = \"{$this->location_mapservice}\" >
             $clientScript->registerScript('sGlobalMapScriptVar',"LSmap=".ls_json_encode($aGlobalMapScriptVar).";\nLSmaps= new Array();",CClientScript::POS_HEAD);
             $clientScript->registerScript('sThisMapScriptVar'.$this->sgqa,"LSmaps['{$this->sgqa}']=".ls_json_encode($aThisMapScriptVar),CClientScript::POS_HEAD);
             $clientScript->registerScriptFile(Yii::app()->getConfig('generalscripts')."map.js");
-            $clientScript->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'map.css');
+            $clientScript->registerCssFile(App()->publicUrl . '/styles-public/' . 'map.css');
 
             $html = "
             <div class=\"question answer-item geoloc-item {$extraclass}\">
diff --git a/protected/themes/default/assets/css/style.css b/protected/themes/default/assets/css/style.css
index 2bcb59b7b25..6f7492a535a 100644
--- a/protected/themes/default/assets/css/style.css
+++ b/protected/themes/default/assets/css/style.css
@@ -75,4 +75,8 @@ table.upgrade tr.disabled {
 body {
     position: relative;
     margin-top: 70px;
+}
+
+.languageList .checkbox {
+    display:inline-block; width: 19%;
 }
\ No newline at end of file
diff --git a/protected/themes/default/assets/limesurvey.pal b/protected/themes/default/assets/limesurvey.pal
new file mode 100644
index 00000000000..79f4b584bb9
--- /dev/null
+++ b/protected/themes/default/assets/limesurvey.pal
@@ -0,0 +1,72 @@
+20,130,200,0
+232,95,51,0
+34,205,33,0
+210,211,28,0
+134,179,129,0
+201,171,131,0
+251,231,221,0
+23,169,161,0
+167,187,213,0
+211,151,213,0
+147,145,246,0
+147,39,90,0
+250,250,201,0
+201,250,250,0
+94,0,94,0
+250,125,127,0
+0,96,201,0
+201,202,250,0
+0,0,127,0
+250,0,250,0
+250,250,0,0
+0,250,250,0
+127,0,127,0
+127,0,0,0
+0,125,127,0
+0,0,250,0
+0,202,250,0
+201,250,250,0
+201,250,201,0
+250,250,151,0
+151,202,250,0
+251,149,201,0
+201,149,250,0
+250,202,151,0
+45,96,250,0
+45,202,201,0
+151,202,0,0
+250,202,0,0
+250,149,0,0
+250,96,0,0
+184,230,115,0
+102,128,64,0
+220,230,207,0
+134,191,48,0
+184,92,161,0
+128,64,112,0
+230,207,224,0
+191,48,155,0
+230,138,115,0
+128,77,64,0
+230,211,207,0
+191,77,48,0
+80,161,126,0
+64,128,100,0
+207,230,220,0
+48,191,130,0
+25,25,179,0
+18,18,125,0
+200,200,255,0
+145,145,255,0
+255,178,0,0
+179,125,0,0
+255,236,191,0
+255,217,128,0
+255,255,0,0
+179,179,0,0
+255,255,191,0
+255,255,128,0
+102,0,153,0
+71,0,107,0
+234,191,255,0
+213,128,255,0
\ No newline at end of file
diff --git a/protected/views/admin/assessments_view.php b/protected/views/admin/assessments_view.php
index 85227ebba92..eb8a97cda81 100644
--- a/protected/views/admin/assessments_view.php
+++ b/protected/views/admin/assessments_view.php
@@ -102,7 +102,7 @@
     <?php foreach ($assessmentlangs as $assessmentlang)
     {
 	    $position=0;
-	    echo '<li class="ui-state-default ui-corner-top" style="clear: none;"><a href="#tablang'.$assessmentlang.'">'.getLanguageNameFromCode($assessmentlang, false);
+	    echo '<li class="ui-state-default ui-corner-top" style="clear: none;"><a href="#tablang'.$assessmentlang.'">'.\ls\helpers\SurveyTranslator::getLanguageNameFromCode($assessmentlang, false);
 	    if ($assessmentlang==$baselang) {echo ' ('.gT("Base language").')';}
 	    echo '</a></li>';
     } ?>
diff --git a/protected/views/admin/dataentry/active_html_view.php b/protected/views/admin/dataentry/active_html_view.php
index a6108fa3182..1ce868ad8ec 100644
--- a/protected/views/admin/dataentry/active_html_view.php
+++ b/protected/views/admin/dataentry/active_html_view.php
@@ -49,10 +49,10 @@ function saveshow(value)
                     <?php foreach ($slangs as $lang)
                     {
                         if ($lang == $baselang) { ?>
-                            <option value='<?php echo $lang; ?>' selected='selected'><?php echo getLanguageNameFromCode($lang,false); ?></option>
+                            <option value='<?php echo $lang; ?>' selected='selected'><?php echo \ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false); ?></option>
                             <?php }
                         else { ?>
-                            <option value='<?php echo $lang; ?>'><?php echo getLanguageNameFromCode($lang,false); ?></option>
+                            <option value='<?php echo $lang; ?>'><?php echo \ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false); ?></option>
                             <?php }
                     } ?>
                     </select>
diff --git a/protected/views/admin/dataentry/content_view.php b/protected/views/admin/dataentry/content_view.php
index a29aa443157..6e480e7403f 100644
--- a/protected/views/admin/dataentry/content_view.php
+++ b/protected/views/admin/dataentry/content_view.php
@@ -239,7 +239,7 @@ function checkconditions(){};
 
             <?php foreach ($slangs as $lang)
                 { ?>
-                <option value='<?php echo $lang; ?>'><?php echo getLanguageNameFromCode($lang,false); ?></option>
+                <option value='<?php echo $lang; ?>'><?php echo \ls\helpers\SurveyTranslator::getLanguageNameFromCode($lang,false); ?></option>
                 <?php } ?>
         </select>
         <?php break;
diff --git a/protected/views/admin/export/statistics_view.php b/protected/views/admin/export/statistics_view.php
index eff337c61f1..d4dbc757f90 100644
--- a/protected/views/admin/export/statistics_view.php
+++ b/protected/views/admin/export/statistics_view.php
@@ -9,10 +9,10 @@
 <script type='text/javascript'>
     var graphUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/graph"); ?>";
     var sStatisticsLanguage="<?php echo $sStatisticsLanguage; ?>";
-    var listColumnUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics/sa/listcolumn/surveyid/".$surveyid."/column/"); ?>";
+    var listColumnUrl="<?php echo Yii::app()->getController()->createUrl("admin/statistics", ['sa' => 'listcolumn', 'surveyid' => $surveyid, 'column' => '']); ?>";
     var showTextInline="<?php echo $showtextinline ?>";
 </script>
-<?php echo CHtml::form(array("admin/statistics/sa/index/surveyid/{$surveyid}/"), 'post', array('name'=>'formbuilder','#'=>'start'));?>
+<?php echo CHtml::form(["admin/statistics", 'sa' => 'index', 'surveyid' => $surveyid], 'post', array('name'=>'formbuilder','#'=>'start'));?>
     <div class='header ui-widget-header header_statistics'>
         <div style='float:right;'><img src='<?php echo $sImageURL; ?>/maximize.png' id='showgfilter' alt='<?php eT("Maximize"); ?>'/><img src='<?php echo $sImageURL; ?>/minimize.png' id='hidegfilter' alt='<?php eT("Minimize"); ?>'/></div>
         <?php eT("General filters"); ?>
@@ -61,7 +61,7 @@
                             {
                                 $language_options .= " selected=\"selected\" " ;
                             }
-                            $temp = getLanguageNameFromCode($survlang,true);
+                            $temp = \ls\helpers\SurveyTranslator::getLanguageNameFromCode($survlang,true);
                             $language_options .= ">".$temp[1]."</option>\n";
 
                         }
@@ -523,7 +523,7 @@
                         if (isset($_POST[$myfield]) && is_array($_POST[$myfield]) && in_array($availlang, $_POST[$myfield]))
                         {echo " selected";}
 
-                        echo ">".getLanguageNameFromCode($availlang,false)."</option>\n";
+                        echo ">".\ls\helpers\SurveyTranslator::getLanguageNameFromCode($availlang,false)."</option>\n";
                     }
                     break;
 
@@ -536,7 +536,7 @@
                     echo "\t</tr>\n\t<tr>\n";
 
                     //get answers
-                    $result[$key1] = Question::model()->getQuestionsForStatistics('title, question', "parent_qid='$flt[0]' AND language = '{$language}'", 'question_order');
+                    $result[$key1] = Question::model()->getQuestionsForStatistics('title, question', "parent_qid='$flt[0]'", 'question_order');
                     $counter2=0;
 
                     //check all the results
diff --git a/protected/views/admin/labels/editlabel_view.php b/protected/views/admin/labels/editlabel_view.php
index 78451f5188b..d3153fcbd08 100644
--- a/protected/views/admin/labels/editlabel_view.php
+++ b/protected/views/admin/labels/editlabel_view.php
@@ -26,7 +26,7 @@
                                     <?php foreach ($langidsarray as $langid)
                                         { ?>
                                         <option id='<?php echo $langid; ?>' value='<?php echo $langid; ?>'
-                                            ><?php echo getLanguageNameFromCode($langid,false); ?></option>
+                                            ><?php echo \ls\helpers\SurveyTranslator::getLanguageNameFromCode($langid,false); ?></option>
                                         <?php } ?>
 
 
diff --git a/protected/views/admin/labels/labelview_view.php b/protected/views/admin/labels/labelview_view.php
index 56c1b72624c..e91a61959ff 100644
--- a/protected/views/admin/labels/labelview_view.php
+++ b/protected/views/admin/labels/labelview_view.php
@@ -9,7 +9,7 @@
         <?php
             foreach ($lslanguages as $i => $language)
                 echo "
-                <li><a href='#neweditlblset$i'>" . getLanguageNameFromCode($language, false) . "</a></li>";
+                <li><a href='#neweditlblset$i'>" . \ls\helpers\SurveyTranslator::getLanguageNameFromCode($language, false) . "</a></li>";
             echo "
             <li><a href='#up_resmgmt'>" . gT("Uploaded resources management") . "</a></li>";
         ?>
diff --git a/protected/views/admin/participants/blacklist_view.php b/protected/views/admin/participants/blacklist_view.php
index 01ba48f98e2..86e55f22600 100644
--- a/protected/views/admin/participants/blacklist_view.php
+++ b/protected/views/admin/participants/blacklist_view.php
@@ -1,4 +1,4 @@
-<script src="<?php echo Yii::app()->getConfig('adminscripts') . "userControl.js" ?>" type="text/javascript"></script>
+<script src="<?php echo App()->publicUrl . '/scripts/admin/' . "userControl.js" ?>" type="text/javascript"></script>
 <div class='header ui-widget-header'>
     <strong>
         <?php
diff --git a/protected/views/admin/participants/participantsPanel_view.php b/protected/views/admin/participants/participantsPanel_view.php
index a30a715e329..1a617d5761d 100644
--- a/protected/views/admin/participants/participantsPanel_view.php
+++ b/protected/views/admin/participants/participantsPanel_view.php
@@ -1,4 +1,4 @@
-<script src="<?php echo Yii::app()->getConfig('adminscripts') . "participantpanel.js" ?>" type="text/javascript"></script>
+<script src="<?php echo App()->publicUrl . '/scripts/admin/' . "participantpanel.js" ?>" type="text/javascript"></script>
 <script type="text/javascript">
     var exporttocsvcountall = "<?php echo Yii::app()->getController()->createUrl("/admin/participants/sa/exporttocsvcountAll"); ?>";
     var exporttocsvall = "<?php echo Yii::app()->getController()->createUrl("exporttocsvAll"); ?>";
diff --git a/protected/views/admin/participants/userControl_view.php b/protected/views/admin/participants/userControl_view.php
index 3dea71df449..e643fdf0962 100644
--- a/protected/views/admin/participants/userControl_view.php
+++ b/protected/views/admin/participants/userControl_view.php
@@ -1,4 +1,4 @@
-<script src="<?php echo Yii::app()->getConfig('adminscripts') . "userControl.js" ?>" type="text/javascript"></script>
+<script src="<?php echo App()->publicUrl . '/scripts/admin/' . "userControl.js" ?>" type="text/javascript"></script>
 <div class='header ui-widget-header'>
     <strong>
         <?php
diff --git a/protected/views/admin/super/header.php b/protected/views/admin/super/header.php
index 8740f8041c7..c8f2030e520 100644
--- a/protected/views/admin/super/header.php
+++ b/protected/views/admin/super/header.php
@@ -7,25 +7,24 @@
         App()->getClientScript()->registerPackage('jqueryui');
 
         App()->getClientScript()->registerPackage('qTip2');
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "jquery-ui/jquery-ui.css" );
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "superfish.css" );
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.css');
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl') . 'jquery.multiselect.filter.css');
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') .  "displayParticipants.css");
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('styleurl') . "adminstyle.css" );
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle.css" );
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "jquery-ui/jquery-ui.css" );
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "superfish.css" );
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . 'jquery.multiselect.css');
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles-public/' . 'jquery.multiselect.filter.css');
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' .  "displayParticipants.css");
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "adminstyle.css" );
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "adminstyle.css" );
         if (\ls\helpers\SurveyTranslator::getLanguageRTL($_SESSION['adminlang']))
         {        
-            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle-rtl.css" );
+            App()->getClientScript()->registerCssFile(App()->getConfig('adminstyleurl') . "adminstyle-rtl.css" );
         }
-        App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "printablestyle.css", 'print');
+        App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "printablestyle.css", 'print');
     ?>
     <?php echo $datepickerlang;?>
     <title><?php echo $sitename;?></title>
     <link rel="shortcut icon" href="<?php echo $baseurl;?>images/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="<?php echo $baseurl;?>images/favicon.ico" type="image/x-icon" />
     <?php $this->widget('ext.LimeScript.LimeScript'); ?>
-    <?php $this->widget('ext.LimeDebug.LimeDebug'); ?>
 </head>
 <body>
 <?php if(isset($formatdata)) { ?>
diff --git a/protected/views/global/menu.php b/protected/views/global/menu.php
index a1d6863baba..aa4f344ee7a 100644
--- a/protected/views/global/menu.php
+++ b/protected/views/global/menu.php
@@ -44,7 +44,7 @@
             ],
             [
                 'title' => gT('Edit label sets'),
-                'url' => ['admin/labels', 'sa' => 'view'],
+                'url' => ['labels/index'],
                 'icon' => 'list',
                 'visible' => App()->user->checkAccess('labelsets')
             ],
diff --git a/protected/views/global/surveyMenu.php b/protected/views/global/surveyMenu.php
index 0b9c0678442..4942ce01766 100644
--- a/protected/views/global/surveyMenu.php
+++ b/protected/views/global/surveyMenu.php
@@ -49,12 +49,12 @@
             [
                 'label' => gT('Show responses'),
                 'icon' => 'eye-open',
-
+                'disabled' => $model->responseCount == 0,
                 'url' => ["responses/index", 'id' => $model->sid],2
             ], [
                 'label' => gT('Export'),
                 'icon' => 'download',
-//                'disabled' => $model->responseCount == 0,
+                'disabled' => $model->responseCount == 0,
                 'url' => ["responses/export", 'id' => $model->sid],
             ]
 
diff --git a/protected/views/labels/create.php b/protected/views/labels/create.php
new file mode 100644
index 00000000000..c38c7abfabd
--- /dev/null
+++ b/protected/views/labels/create.php
@@ -0,0 +1,30 @@
+<?php
+
+
+/** @var TbActiveForm $form */
+$form = $this->beginWidget(TbActiveForm::class, [
+    'enableAjaxValidation' => false,
+    'enableClientValidation' => true,
+    'layout' => TbHtml::FORM_LAYOUT_HORIZONTAL,
+    'method' => $model->isNewRecord ? 'POST': 'PUT',
+    'htmlOptions' => [
+        'validateOnSubmit' => true
+    ]
+]);
+
+echo $form->textFieldControlGroup($model, 'label_name');
+$options = CHtml::listData(App()->getLocale()->data(), 'code', 'description');
+echo $form->checkBoxListControlGroup($model, 'languageArray', $options, [
+    'containerOptions' => [
+        'class' => 'languageList'
+    ]
+]);
+
+echo TbHtml::openTag('div', ['class' => 'pull-right btn-group']);
+echo TbHtml::submitButton(gT('Save'), [
+    'color' => 'primary'
+]);
+echo TbHtml::closeTag('div');
+
+$this->endWidget();
+
diff --git a/protected/views/labels/index.php b/protected/views/labels/index.php
new file mode 100644
index 00000000000..eddc02c1c6e
--- /dev/null
+++ b/protected/views/labels/index.php
@@ -0,0 +1,68 @@
+<?php
+/** @var CActiveDataProvider $dataProvider */
+
+$actions = TbHtml::tag('div', [
+    'style' => 'padding-left: 10px; margin-top: -21px;'
+], implode(" ", [
+    '└─── ',
+    gT("With selected") . ':',
+    TbHtml::openTag('div', ['class' => 'btn-group']),
+    TbHtml::submitButton('', [
+        'color' => 'primary',
+        'icon' => 'trash',
+        'title' => gT('Delete surveys'),
+        'formaction' => App()->createUrl('surveys/deleteMultiple'),
+        'data-method' => 'delete',
+        'data-confirm' => gT("This will delete all selected surveys, are you sure?")
+    ]),
+    TbHtml::submitButton('', [
+        'icon' => 'play',
+        'title' => gT("Activate selected surveys"),
+        'formaction' => App()->createUrl('surveys/activateMultiple'),
+        'data-confirm' => gT("This will activate all selected surveys, are you sure?")
+    ]),
+    TbHtml::submitButton('', [
+        'icon' => 'stop',
+        'color' => 'danger',
+        'title' => gT("Stop selected surveys"),
+        'formaction' => App()->createUrl('surveys/deactivateMultiple'),
+        'data-confirm' => gT("This will deactivate all selected surveys, are you sure?")
+    ]),
+    TbHtml::endForm()
+]));
+
+echo TbHtml::beginForm('', 'post');
+$this->widget(WhGridView::class, [
+    'template' => "{summary}\n{items}\n{pager}\n{extendedSummary}",
+    'dataProvider' => $dataProvider,
+    'selectableRows' => 0,
+//    'filter' => $filter,
+    'columns' => [
+        [
+            'htmlOptions' => [
+                'style' => 'width: 100px;',
+            ],
+            'class' => TbButtonColumn::class,
+            'template' => '{remove} {update}',
+            'header' => gT("Actions"),
+            'buttons' => [
+                'remove' => [
+                    'icon' => 'trash',
+                    'label' => gT("Remove labelset"),
+                    'options' => [
+                        'data-confirm' => gT("Are you sure you want to delete this survey?"),
+                        'data-method' => 'delete'
+                    ],
+                    'url' => function(\ls\models\LabelSet $model) {
+                        return App()->createUrl('labels/delete', ['id' => $model->primaryKey]);
+                    },
+                ]
+            ]
+
+
+        ],
+        'label_name',
+        'languages'
+
+    ]
+]);
diff --git a/protected/views/labels/update.php b/protected/views/labels/update.php
new file mode 100644
index 00000000000..5497097ff33
--- /dev/null
+++ b/protected/views/labels/update.php
@@ -0,0 +1,198 @@
+<?php
+//    $this->renderPartial('create', ['model' => $model]);
+    App()->clientScript->registerPackage('handsontable');
+    echo \TbHtml::tag('div', [
+        'id' => 'labels'
+    ]);
+    $languages = CHtml::listData(App()->getLocale()->data(), 'code', 'description');
+    $columns = [
+        [
+            'label' => 'Code',
+            'type' => 'text'
+        ], [
+            'label' => 'Assessment value',
+            'type' => 'numeric'
+        ]
+    ];
+    foreach($model->languageArray as $language) {
+        $columns[] = [
+            'label' => $languages[$language],
+            'type' => 'text'
+        ];
+    }
+
+    $columns[] = [
+        'label' => 'Add language',
+        'type' => 'text',
+        'readOnly' => true
+    ];
+
+    $data = [array_values(CHtml::listData($columns, 'label', 'label'))];
+
+?>
+
+<script>
+    var
+        tpl = ['A1', 0],
+        data = <?=json_encode($data); ?>,
+        container = document.getElementById('labels'),
+        languages = <?=json_encode(array_values(CHtml::listData(App()->getLocale()->data(), 'code', 'description'))); ?>;
+
+
+
+
+    function isEmptyRow(instance, row) {
+        var rowData = instance.getData()[row];
+
+        for (var i = 0, ilen = rowData.length; i < ilen; i++) {
+            if (rowData[i] !== null) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    function defaultValueRenderer(instance, td, row, col, prop, value, cellProperties) {
+        var args = arguments;
+        if (args[5] === null && isEmptyRow(instance, row)) {
+            if (col === 0) {
+                args[5] = 'A' + row;
+            } else {
+                args[5] = tpl[col];
+            }
+            td.style.color = '#999';
+        }
+        else {
+            td.style.color = '';
+        }
+
+        if (cellProperties.readOnly === true) {
+            console.log('setting');
+            td.style.background = '#555';
+        }
+        Handsontable.renderers.TextRenderer.apply(this, args);
+    }
+
+    hot1 = new Handsontable(container, {
+//        startRows: 8,
+//        columns: <?//=json_encode($columns); ?>//,
+        startCols: <?=count($columns) ?>,
+        minSpareRows: 1,
+        colHeaders: false,
+        contextMenu: true,
+        cells: function (row, col, prop) {
+            var cellProperties = {};
+            cellProperties.readOnly = (row === 0);
+            if (row === 0 && (this.instance.countCols() - 1) === col) {
+                cellProperties.type = 'dropdown';
+                cellProperties.readOnly = false;
+                var current = this.instance.getDataAtRow(0);
+                cellProperties.source = languages.filter(function(element) {
+                    return current.indexOf(element) == -1;
+                });
+
+                cellProperties.source.unshift('Add language');
+
+            } else if ((this.instance.countCols() - 1) === col) {
+                cellProperties.readOnly = true;
+                cellProperties.renderer = defaultValueRenderer;
+            } else {
+
+                cellProperties.renderer = defaultValueRenderer;
+            }
+
+            if (col === 1) {
+                cellProperties.type = 'numeric';
+            }
+            return cellProperties;
+        },
+        legend: [
+            {
+                match: function (row, col, data) {
+                    return (row === 0);
+                },
+                style: {
+                    color: '#666',
+                    fontWeight: 'bold'
+                },
+                title: 'Heading',
+                readOnly: true
+            }
+        ],
+//        afterOnCellMouseDown: function (e, coords, TD) {
+//            debugger;
+//        },
+        beforeChange: function (changes) {
+            var ilen = changes.length,
+                clen = this.countCols(),
+                rowColumnSeen = {},
+                rowsToFill = {},
+                i,
+                c;
+            for (i = 0; i < ilen; i++) {
+                // if oldVal is empty
+                if (changes[i][2] === null && changes[i][3] !== null) {
+                    if (isEmptyRow(this, changes[i][0])) {
+                        // add this row/col combination to cache so it will not be overwritten by template
+                        rowColumnSeen[changes[i][0] + '/' + changes[i][1]] = true;
+                        rowsToFill[changes[i][0]] = true;
+                    }
+                }
+
+                if (changes[i][0] === 0 && (changes[i][1] === clen - 1)) {
+                    if (languages.indexOf(changes[i][3]) !== - 1) {
+                        console.log('setting');
+                        this.setDataAtCell(0, clen, 'Add language');
+                    }
+
+                }
+            }
+            for (var r in rowsToFill) {
+                if (rowsToFill.hasOwnProperty(r)) {
+                    for (c = 0; c < clen; c++) {
+                        // if it is not provided by user in this change set, take value from template
+                        if (!rowColumnSeen[r + '/' + c]) {
+                            changes.push([r, c, null, tpl[c]]);
+                        }
+                    }
+                }
+            }
+        },
+        autoWrapRow: true,
+        allowInsertColumn: false,
+        allowInvalid: false,
+        rowHeaders: true,
+        colHeaders: function(index) {
+            console.log(this);
+            return this.data[0][index];
+        },
+        manualRowMove: true,
+        contextMenu: {
+            items: {
+                row_above: {},
+                row_below: {},
+                "hsep1": "---------",
+                remove_row: {},
+                remove_col: {
+
+                    disabled: function () {
+                        var col = this.getSelected()[1];
+                        return col < 2 || col === (this.countCols() - 1);
+                    }
+                }
+
+            }
+        }
+
+
+
+
+    });
+
+    hot1.loadData(data);
+
+
+
+
+</script>
diff --git a/protected/views/labels/updateLabel.php b/protected/views/labels/updateLabel.php
new file mode 100644
index 00000000000..5e43db013f4
--- /dev/null
+++ b/protected/views/labels/updateLabel.php
@@ -0,0 +1,25 @@
+<?php
+/** @var \ls\models\LabelSet $model */
+/** @var TbActiveForm $form */
+$form = $this->beginWidget(TbActiveForm::class, [
+    'enableAjaxValidation' => false,
+    'enableClientValidation' => true,
+    'layout' => TbHtml::FORM_LAYOUT_HORIZONTAL,
+    'method' => 'PUT',
+    'action' => ['labels/set-label'],
+    'htmlOptions' => [
+        'validateOnSubmit' => true
+    ]
+]);
+$labels = array_filter($model->labels, function(\ls\models\Label $label) use ($language) {
+    return $label->language == $language;
+});
+$label = new \ls\models\Label();
+$label->lid = $model->primaryKey();
+$labels[] = $label;
+foreach($labels as $label) {
+    echo $form->textFieldControlGroup($label, 'code');
+    echo $form->numberFieldControlGroup($label, 'assessment_value');
+    echo $form->textFieldControlGroup($label, 'title');
+}
+$this->endWidget();
\ No newline at end of file
diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 81d49c66e5f..00f1528aeb2 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -14,6 +14,9 @@
             $cs->registerScriptFile(App()->getBaseUrl() . Yii::getPathOfAlias('public') . '/scripts/unobtrusive.js');
             $cs->registerCssFile(App()->theme->baseUrl . '/css/style.css');
 
+            // Disable disabled links.
+            $cs->registerScript('links', "$('body').on('click', '.disabled a', function (e) { console.log('noo'); e.preventDefault(); });");
+
         ?>
         <title>Limesurvey Administration</title>
     </head>
diff --git a/protected/views/layouts/popup.php b/protected/views/layouts/popup.php
index 4f0b27b13b4..844bfccab64 100644
--- a/protected/views/layouts/popup.php
+++ b/protected/views/layouts/popup.php
@@ -7,17 +7,16 @@
             App()->getClientScript()->registerPackage('jqueryui');
             App()->getClientScript()->registerPackage('qTip2');
              // Needed by admin_core : to be fixed ?
-            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "admin_core.js");
-            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "jquery-ui/jquery-ui.css" );
-            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "printablestyle.css", 'print');
-            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('styleurl') . "adminstyle.css" );
-            App()->getClientScript()->registerCssFile(Yii::app()->getConfig('adminstyleurl') . "adminstyle.css" );
+            App()->getClientScript()->registerScriptFile(App()->publicUrl . '/scripts/admin/' . "admin_core.js");
+            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "jquery-ui/jquery-ui.css" );
+            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "printablestyle.css", 'print');
+            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "adminstyle.css" );
+            App()->getClientScript()->registerCssFile(App()->publicUrl . '/styles/gringegreen/' . "adminstyle.css" );
 
         ?>
         <link rel="shortcut icon" href="<?php echo App()->baseUrl; ?>images/favicon.ico" type="image/x-icon" />
         <link rel="icon" href="<?php echo App()->baseUrl; ?>images/favicon.ico" type="image/x-icon" />
         <?php $this->widget('ext.LimeScript.LimeScript'); ?>
-        <?php $this->widget('ext.LimeDebug.LimeDebug'); ?>
         <title><?php echo $this->pageTitle; ?></title>
     </head>
     <body>
@@ -27,7 +26,7 @@
             <?php echo $content; ?>
             </div>
             <div id="ajaxprogress" title="Ajax request in progress" style="text-align: center">
-                <img src="<?php echo Yii::app()->getConfig('adminstyleurl');?>/images/ajax-loader.gif"/>
+                <img src="<?php echo App()->publicUrl . '/styles/gringegreen/';?>/images/ajax-loader.gif"/>
             </div>
         </div>
     </body>
diff --git a/protected/views/layouts/survey.php b/protected/views/layouts/survey.php
index ed250ed8690..a3848d79b73 100644
--- a/protected/views/layouts/survey.php
+++ b/protected/views/layouts/survey.php
@@ -26,7 +26,7 @@
             $cs->registerScriptFile("$public/scripts/htmleditor.js");
 
             // Disable disabled links.
-            $cs->registerScript('links', "$('body').on('click', '.disabled a', function (e) { e.preventDefault(); });");
+            $cs->registerScript('links', "$('body').on('click', '.disabled a', function (e) { console.log('noo'); e.preventDefault(); });");
 
         ?>
         <title>Limesurvey Administration</title>
diff --git a/protected/views/settings/global/language.php b/protected/views/settings/global/language.php
index 14a06f036de..16e5bcfb04d 100644
--- a/protected/views/settings/global/language.php
+++ b/protected/views/settings/global/language.php
@@ -8,8 +8,10 @@
 
 // Use checkbox list for better usability versus select2..
 $attribute = 'disabledLanguages';
-echo $form->checkBoxListControlGroup($settings, $attribute, $options);
-\TbHtml::resolveNameID($settings, $attribute, $opts);
-App()->clientScript->registerCss('languages', "#{$opts['id']} .checkbox { display:inline-block; width: 19%;}");
+echo $form->checkBoxListControlGroup($settings, $attribute, $options, [
+    'containerOptions' => [
+        'class' => 'languageList'
+    ]
+]);
 echo TbHtml::closeTag('fieldset');
 ?>
\ No newline at end of file
diff --git a/protected/views/surveys/update/languages.php b/protected/views/surveys/update/languages.php
index 1a4d6c77b71..ca7a4431a14 100644
--- a/protected/views/surveys/update/languages.php
+++ b/protected/views/surveys/update/languages.php
@@ -1,6 +1,12 @@
 <?php
+
 echo TbHtml::openTag('fieldset', []);
+
 echo $form->dropDownListControlGroup($survey, 'language', CHtml::listData(\ls\helpers\SurveyTranslator::getLanguageData(), 'code', 'description'));
-App()->clientScript->registerCss('languages', '#Survey_additionalLanguages .checkbox { display:inline-block; width: 19%;}');
-echo $form->checkBoxListControlGroup($survey, 'additionalLanguages', CHtml::listData(\ls\helpers\SurveyTranslator::getLanguageData(), 'code', 'description'));
+
+echo $form->checkBoxListControlGroup($survey, 'additionalLanguages', CHtml::listData(\ls\helpers\SurveyTranslator::getLanguageData(), 'code', 'description'), [
+    'containerOptions' => [
+        'class' => 'languageList'
+    ]
+]);
 echo TbHtml::closeTag('fieldset');
\ No newline at end of file
diff --git a/public/styles/gringegreen/limesurvey.pal b/public/styles/gringegreen/limesurvey.pal
deleted file mode 100644
index aaee82a17fb..00000000000
--- a/public/styles/gringegreen/limesurvey.pal
+++ /dev/null
@@ -1,72 +0,0 @@
-20,130,200
-232,95,51
-34,205,33
-210,211,28
-134,179,129
-201,171,131
-251,231,221
-23,169,161
-167,187,213
-211,151,213
-147,145,246
-147,39,90
-250,250,201
-201,250,250
-94,0,94
-250,125,127
-0,96,201
-201,202,250
-0,0,127
-250,0,250
-250,250,0
-0,250,250
-127,0,127
-127,0,0
-0,125,127
-0,0,250
-0,202,250
-201,250,250
-201,250,201
-250,250,151
-151,202,250
-251,149,201
-201,149,250
-250,202,151
-45,96,250
-45,202,201
-151,202,0
-250,202,0
-250,149,0
-250,96,0
-184,230,115
-102,128,64
-220,230,207
-134,191,48
-184,92,161
-128,64,112
-230,207,224
-191,48,155
-230,138,115
-128,77,64
-230,211,207
-191,77,48
-80,161,126
-64,128,100
-207,230,220
-48,191,130
-25,25,179
-18,18,125
-200,200,255
-145,145,255
-255,178,0
-179,125,0
-255,236,191
-255,217,128
-255,255,0
-179,179,0
-255,255,191
-255,255,128
-102,0,153
-71,0,107
-234,191,255
-213,128,255
\ No newline at end of file