diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 8a62385f8..4e26eba5c 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -2226,6 +2226,7 @@ class SurveyAdmin
                 || $_GET['a'] == 'forma'
                 || $_GET['a'] == 'metadata'
                 || $_GET['a'] == 'mobile_settings'
+                || $_GET['a'] == 'table_settings'
                 || $_GET['a'] == A_PRIKAZ
                 || $_GET['a'] == A_MISSING
                 || $_GET['a'] == A_SKUPINE
@@ -2554,6 +2555,7 @@ class SurveyAdmin
             || $_GET['a'] == 'forma'
             || $_GET['a'] == 'metadata'
             || $_GET['a'] == 'mobile_settings'
+            || $_GET['a'] == 'table_settings'
             || $_GET['a'] == A_PRIKAZ
             || $_GET['a'] == A_EXPORTSETTINGS
             || $_GET['a'] == A_GDPR
@@ -3127,6 +3129,11 @@ class SurveyAdmin
         echo '<li ' . ($get == A_MOBILESETTINGS ? 'class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_MOBILESETTINGS . '" title="' . $lang['srv_mobile_settings'] . '">' . $lang['srv_mobile_settings'] . '</a></li> ';
 
+        # prikaz tabel
+        echo '<li ' . ($get == A_TABLESETTINGS ? 'class="active"' : '') . '>';
+        echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TABLESETTINGS . '" title="' . $lang['srv_table_settings'] . '">' . $lang['srv_table_settings'] . '</a></li> ';
+
+                
         # prevajanje - jezik (standardne besede)
         echo '<li ' . ($get == A_JEZIK ? 'class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_JEZIK . '" title="' . $lang['srv_standardne_besede'] . '">' . $lang['srv_standardne_besede'] . '</a></li> ';
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index f1ec30e05..3573c5588 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -933,6 +933,10 @@ class SurveyAdminAjax {
 				if (isset($_POST['mobile_tables'])) {
 					SurveySetting::getInstance()->setSurveyMiscSetting('mobile_tables', $_POST['mobile_tables']);
 				}
+
+                if (isset($_POST['pc_tables'])) {
+					SurveySetting::getInstance()->setSurveyMiscSetting('pc_tables', $_POST['pc_tables']);
+				}
 				
 				if (isset($_POST['export_font_size'])) {
 					SurveySetting::getInstance()->setSurveyMiscSetting('export_font_size', $_POST['export_font_size']);
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 825f2eb0c..16b4ade56 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -502,11 +502,11 @@ class SurveyAdminSettings {
 
 			echo '<div class="setting_item">';
 			echo '<input type="radio" id="defValidProfile2" name="defValidProfile" '.($row['defValidProfile']==2?' checked':'').' value="2">';
-			echo '<label for="defValidProfile2">'.$lang['srv_prikaz_default_valid1'].'</label>';
+			echo '<label for="defValidProfile2">'.'(5,6) '.$lang['srv_data_valid_units'].'</label>';
 			echo '</div>';
 			echo '<div class="setting_item">';
 			echo '<input type="radio" id="defValidProfile3" name="defValidProfile" '.($row['defValidProfile']==3?' checked':'').' value="3">';
-			echo '<label for="defValidProfile3">'.$lang['srv_prikaz_default_valid2'].'</label>';
+			echo '<label for="defValidProfile3">'.'(6) '.$lang['srv_data_finished_units'].'</label>';
 			echo '</div>';
 			
 			echo '</div>';
@@ -1771,7 +1771,7 @@ class SurveyAdminSettings {
 			echo '</div>';
 
 			// Prilagoditev tabel pri mobilnikih
-			$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+			/*$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
 			echo '<div class="setting_holder">';
 
 			echo '<span class="setting_title" >'.$lang['srv_settings_mobile_tables'].':</span>';
@@ -1788,12 +1788,69 @@ class SurveyAdminSettings {
 			echo '<label for="mobile_tables_0">'.$lang['no'].'</label> ';			
 			echo '</div>';
 
-			echo '</div>';
+			echo '</div>';*/
 
 			echo '</div>';			
 
 			echo '</fieldset>';
 		}
+
+        /*Nastavitve prikaza za tabele*/
+		if ($_GET['a'] == 'table_settings') {
+
+			SurveySetting::getInstance()->Init($this->anketa);	
+
+			echo '<fieldset>';
+			
+			echo '<legend>'.$lang['srv_table_settings_title'].'</legend>';
+		
+
+            // Prilagoditev tabel na pc-ju
+			$pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
+
+			echo '<div class="setting_holder">';
+
+			echo '<span class="setting_title" >'.$lang['srv_table_settings_pc_tables'].':</span>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="pc_tables" id="pc_tables_1" '.($pc_tables==='1'?' checked':'').' value="1">';
+			echo '<label for="pc_tables_1">'.$lang['yes'].'</label> ';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="pc_tables" id="pc_tables_2" '.($pc_tables==='2'?' checked':'').' value="2">';
+			echo '<label for="pc_tables_2">'.$lang['srv_settings_mobile_tables_slide'].'</label> ';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="pc_tables" id="pc_tables_0" '.($pc_tables==='0'?' checked':'').' value="0">';
+			echo '<label for="pc_tables_0">'.$lang['no'].'</label> ';			
+			echo '</div>';
+
+			echo '</div>';
+
+
+			// Prilagoditev tabel pri mobilnikih
+			$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+
+			echo '<div class="setting_holder">';
+
+			echo '<span class="setting_title" >'.$lang['srv_table_settings_mobile_tables'].':</span>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="mobile_tables" id="mobile_tables_1" '.($mobile_tables==='1'?' checked':'').' value="1">';
+			echo '<label for="mobile_tables_1">'.$lang['yes'].'</label> ';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="mobile_tables" id="mobile_tables_2" '.($mobile_tables==='2'?' checked':'').' value="2">';
+			echo '<label for="mobile_tables_2">'.$lang['srv_settings_mobile_tables_slide'].'</label> ';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="mobile_tables" id="mobile_tables_0" '.($mobile_tables==='0'?' checked':'').' value="0">';
+			echo '<label for="mobile_tables_0">'.$lang['no'].'</label> ';			
+			echo '</div>';
+
+			echo '</div>';
+
+
+			echo '</fieldset>';
+		}
 		
 		/*Metapodatki (Parapodatki)*/
 		if ($_GET['a'] == 'metadata') {
@@ -8741,7 +8798,7 @@ class SurveyAdminSettings {
 			echo $lang['srv_stevilo_vnosov'].':';
 			echo '<div class="max_wrap">';
 			echo '<input class="text large" type="text" name="stevilo_vnosov" value="1" onkeyup="max_stevilo_vnosov();">';
-			echo '<span class="gray">(max 1000)</span>';
+			echo '<span class="gray">(max. 1000)</span>';
 			echo '</div>';
 			echo '</div>';
 
@@ -8761,20 +8818,22 @@ class SurveyAdminSettings {
 
 			echo '<a class="noline" href="#" onClick="delete_test_data();"><span class="faicon trash empty link-right"></span>'.$lang['srv_delete_testdata'].'</a> ('.$total_rows.')';
 			
-			echo '<table class="table_header">';
+		
+			if ($total_rows > 0) {
+
+				echo '<table class="table_header">';
 				echo '<tbody>';
 					echo '<tr>';
 						echo '<td> Labela </td>';
 						echo '<td> Veljavni odgovori (Grafični prikaz) </td>';
 					echo '</tr>';
 				echo '</tbody>';	
-			echo '</table>';
-			
-			if ($total_rows > 0) {
-				
+				echo '</table>';
 				
+
 				$prevpage = 0;
 
+
 				$sql = sisplet_query("SELECT s.id, s.gru_id, s.tip, s.naslov, g.naslov AS pagename FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND s.visible='1' AND g.ank_id='$this->anketa' ORDER BY g.vrstni_red, s.vrstni_red");
 				while ($row = mysqli_fetch_array($sql)) {
 					
diff --git a/admin/survey/api/api_test.php b/admin/survey/api/api_test.php
index 6e292c5c4..33e879860 100644
--- a/admin/survey/api/api_test.php
+++ b/admin/survey/api/api_test.php
@@ -8,26 +8,30 @@
 
 // Nastavimo url api-ja
 //$api_url = 'http://test.1ka.si/admin/survey/api/api.php';
-//$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
 
 // Nastavimo identifier in key userja
-$identifier = 'a1c3b90fdae3c45d';
-$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';
+/*$identifier = 'a1c3b90fdae3c45d';
+$private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e';*/
 
-$api_url = 'http://localhost/admin/survey/api/api.php';
+$api_url = 'https://www.1ka.si/admin/survey/api/api.php';
+$identifier = '3ccc9cbc90493d09';
+$private_key = 'b8dbeceed3d0d7f80ca5d82ba352d9696c1804ff9b9d45272b8e99ea0a4987d6';
+
+/*$api_url = 'http://localhost/admin/survey/api/api.php';
 $identifier = '0d712128f7fe5707';
-$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';
+$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be';*/
 
 
 // Nastavimo parametre
-//$ank_id = '8086';
+$ank_id = '384751';
 //$action = 'getSurveyQuestions';
-$action = 'createSurvey';
+//$action = 'createSurvey';
+$action = 'getSurveyResponseData';
 
 
 // Izvedemo klic (GET ali POST)
 //$result = executeGET();
-$result = executePOST();
+//$result = executePOST();
 
 
 
@@ -55,6 +59,7 @@ function executeGET(){
 	// GET params
 	$params = 'action='.$action;		// Funkcija, ki jo želimo izvesti
 	$params .= '&ank_id='.$ank_id;		// ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
+	$params .= '&usr_id=50666962';		// ostali parametri potrebni za klic funkcije (id ankete, vprašanja...)
 			
 	// Pripravimo podatke za hashiranje
 	$request_method = 'GET';
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 5a6bc9db4..a74ec0090 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -64,10 +64,10 @@ class GDPR{
 
 		echo '<div class="box-container">';
 
-			echo '<div class= "num_box num_box1 checked" id="num_box1">';
+			echo '<div class= "num_box num_box1 checked" id="num_box1" onclick="gdpr_ankete()">';
 
 				echo '<div class="box_flex" id="box_flex">';
-					echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="test_function()">';
+					echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="gdpr_ankete()">';
 					echo '<div class="naslov_gdpr"> GDPR ANKETE</div>';
 				echo '</div>';
 
@@ -83,10 +83,10 @@ class GDPR{
 			echo '</div>';
 
 
-			echo '<div class= "num_box num_box2 checked" id="num_box2">';
+			echo '<div class= "num_box num_box2 checked" id="num_box2" onclick="potenc_gdpr_ankete()">';
 
 				echo '<div class="box_flex" id="box_flex potenc_gdpr">';
-					echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="test_function()">';
+					echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="potenc_gdpr_ankete()">';
 					echo '<div class="naslov_gdpr"> POTENCIALNO GDPR ANKETE</div>';
 				echo '</div>';
 
@@ -102,10 +102,10 @@ class GDPR{
 			echo '</div>';
 			
 			
-			echo '<div class= "num_box num_box3 checked" id="num_box3">';
+			echo '<div class= "num_box num_box3 checked" id="num_box3" onclick="ne_gdpr_ankete()">';
 
 				echo '<div class="box_flex" id="box_flex">';
-				echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="test_function()" >';
+				echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="ne_gdpr_ankete()" >';
 					echo '<div class="naslov_gdpr"> NE-GDPR ANKETE</div>';
 				echo '</div>';
 
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index b9c44700e..abf919188 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -145,6 +145,7 @@ class CrossRoad {
                 case A_MISSING:
                 case A_METADATA:
                 case A_MOBILESETTINGS:
+                case A_TABLESETTINGS:
                 case A_JEZIK: # nastavitve jezik
                 case A_UREJANJE: # nastavitve komentarjev
                 case A_PRIKAZ: # nastavitve komentarjev
diff --git a/admin/survey/definition.php b/admin/survey/definition.php
index 50206f69a..b7864bf4b 100644
--- a/admin/survey/definition.php
+++ b/admin/survey/definition.php
@@ -241,6 +241,7 @@
 	define('A_FORMA', 'forma');	# urejanje ankete - manjkajoče vrednosti
 	define('A_METADATA', 'metadata');	# urejanje ankete - prikaz metapodatkov
 	define('A_MOBILESETTINGS', 'mobile_settings');	# urejanje ankete - nastavitve prikaza pri mobitelih
+	define('A_TABLESETTINGS', 'table_settings');	# urejanje ankete - nastavitve prikaza tabel
 	define('A_PRIKAZ', 'prikaz');	# prikaz podatkov in analiz
 	define('A_MAILING', 'advanced_email');	# nastavitve email strežnika
 	define('A_SKUPINE', 'skupine');	# skupine
diff --git a/admin/survey/script/GDPR_seznam_anket.js b/admin/survey/script/GDPR_seznam_anket.js
index 5be2c2916..4f39f6b1f 100644
--- a/admin/survey/script/GDPR_seznam_anket.js
+++ b/admin/survey/script/GDPR_seznam_anket.js
@@ -147,7 +147,49 @@ function test_function() {
     }
 }
 
+function gdpr_ankete(){
+    var check_gdpr_ankete = document.getElementById('gdpr_ankete_check');
+    
+    //GDOR ANKETE
+    if (check_gdpr_ankete.checked){
+        check_gdpr_ankete.checked = false;
+        test_function();
+    }
+    else {
+        check_gdpr_ankete.checked = true;
+        test_function();
+    }
+}
 
+function potenc_gdpr_ankete(){
+
+    var check_potenc_gdpr = document.getElementById('potenc_gdpr_ankete_check');
+
+    //POTENCGDOR ANKETE
+    if (check_potenc_gdpr.checked){
+        check_potenc_gdpr.checked = false;
+        test_function();
+    }
+    else {
+        check_potenc_gdpr.checked = true;
+        test_function();
+    }
+}
+
+function ne_gdpr_ankete(){
+
+    var check_negdpr_ankete = document.getElementById('ne_gdpr_ankete');
+
+    //NE GDPR ANKETE
+    if (check_negdpr_ankete.checked){
+        check_negdpr_ankete.checked = false;
+        test_function();
+    }
+    else {
+        check_negdpr_ankete.checked = true;
+        test_function();
+    }
+}
 
 function teme_options(){
     var toggle = document.getElementsByClassName('buttons-window');
diff --git a/lang/1.php b/lang/1.php
index 9c8c15651..b99185486 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4016,6 +4016,10 @@ $lang = array (
 	"srv_mobile_settings_title"			=>	"Prikaz ankete na mobilnih napravah",
 	"srv_mobile_survey"					=>	"Anketa ustvarjena v mobilni aplikaciji",
 	"srv_mobile_add_question"			=>	"Dodaj vprašanje",
+    "srv_table_settings"				=>	"Nastavitve tabel",
+    "srv_table_settings_title"			=>	"Prikaz vprašanj tipa tabela",
+    'srv_table_settings_mobile_tables'  =>	"Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
+    'srv_table_settings_pc_tables'      =>	"Prilagoditev vprašanj tipa 'Tabela' na računalniku",
 	"srv_standardne_besede"				=>	"Standardne besede",
 	"srv_prevajanje_dodaj"				=>	"Dodaj nov prevod za",
 	"srv_base_lang"						=>	"Osnovni jezik",
diff --git a/lang/2.php b/lang/2.php
index 0c653dcda..e30ccf069 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3986,8 +3986,12 @@ $lang = array (
 	"srv_mobile_settings_title"			=>	"Survey display on mobile devices",
 	"srv_mobile_survey"					=>	"Survey created with mobile app",
     "srv_mobile_add_question"			=>	"Add question",
+	"srv_table_settings"				=>	"Table settings",
+    "srv_table_settings_title"			=>	"Table questions settings",
+    'srv_table_settings_mobile_tables'  =>	"Optimization of 'Table' type questions on mobile devices",
+    'srv_table_settings_pc_tables'      =>	"Optimization of 'Table' type questions on desktop computer",
 	"srv_prevajanje_dodaj"				=>	"Add translation for",
-	"srv_multi_lang"						=>	"Multilanguage surveys",
+	"srv_multi_lang"					=>	"Multilanguage surveys",
 	"srv_base_lang"						=>	"Basic language",
 	"srv_lang_elements"					=>	"Standard text",
 	"srv_trans_lang"					=>	"Translation",
diff --git a/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php b/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
index c121fd6e7..30696f9e7 100644
--- a/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
+++ b/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php
@@ -61,7 +61,7 @@ class MultigridMobileController extends Controller{
 		
 		// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
 		SurveySetting::getInstance()->Init(get('anketa'));
-        $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+        $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 		
        
         $gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -95,7 +95,7 @@ class MultigridMobileController extends Controller{
 			
 		
 		// Izrisemo celotno vsebino tabele za mobietl
-		echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+		echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
 		
 		
 		$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -169,14 +169,14 @@ class MultigridMobileController extends Controller{
             echo '  </div>';
 			
 			// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
-			if($mobile_tables == 2)
+			if($tables_setting == 2)
 				echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
 			
             echo '</div>';
 
 
             // IZPOLNJENA VREDNOST, ce obstaja in ce imamo vklopljene mobilne tabele z razpiranjem
-            if($mobile_tables == 2){
+            if($tables_setting == 2){
                 echo '<div class="grid_mobile_result">'.($grid_id != '' ? $grid_data_value : '').'</div>';
             }
 			
@@ -386,7 +386,7 @@ class MultigridMobileController extends Controller{
 		
 		// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
 		SurveySetting::getInstance()->Init(get('anketa'));
-        $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+        $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 		
        
         $gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -439,7 +439,7 @@ class MultigridMobileController extends Controller{
 			
 		
 		// Izrisemo celotno vsebino tabele za mobietl
-		echo '<div class="grid_mobile radio double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+		echo '<div class="grid_mobile radio double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
 		
 		
 		$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -512,7 +512,7 @@ class MultigridMobileController extends Controller{
             echo '  </div>';
 			
 			// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
-			/*if($mobile_tables == 2)
+			/*if($tables_setting == 2)
 				echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
 
 			echo '</div>';
@@ -714,7 +714,7 @@ class MultigridMobileController extends Controller{
 		
 		// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
 		SurveySetting::getInstance()->Init(get('anketa'));
-        $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+        $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 		
 		
         $gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -750,7 +750,7 @@ class MultigridMobileController extends Controller{
 
 
         // Izrisemo celotno vsebino tabele za mobitel
-		echo '<div class="grid_mobile checkbox '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+		echo '<div class="grid_mobile checkbox '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
 		
 		
 		$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -819,7 +819,7 @@ class MultigridMobileController extends Controller{
             echo '</div>';
 			
 			// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
-			if($mobile_tables == 2)
+			if($tables_setting == 2)
 				echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
 
 			echo '</div>';
@@ -931,7 +931,7 @@ class MultigridMobileController extends Controller{
 		
 		// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
 		SurveySetting::getInstance()->Init(get('anketa'));
-        $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+        $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 		
        
         $gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -985,7 +985,7 @@ class MultigridMobileController extends Controller{
 			
 		
 		// Izrisemo celotno vsebino tabele za mobietl
-		echo '<div class="grid_mobile checkbox double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+		echo '<div class="grid_mobile checkbox double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
 		
 		
 		$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -1059,11 +1059,7 @@ class MultigridMobileController extends Controller{
                     echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
             }
             
-            echo '  </div>';
-
-			// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
-			/*if($mobile_tables == 2)
-				echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/            
+            echo '  </div>';      
             
 			echo '</div>';
             
@@ -1269,7 +1265,7 @@ class MultigridMobileController extends Controller{
 
 		// Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
 		SurveySetting::getInstance()->Init(get('anketa'));
-        $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+        $tables_setting = (get('mobile') == 1) ? SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables') : SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 		
 		
         $gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -1325,7 +1321,7 @@ class MultigridMobileController extends Controller{
 
 
         // Izrisemo celotno vsebino tabele za mobitel
-		echo '<div class="grid_mobile text '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+		echo '<div class="grid_mobile text '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
 		
 		
 		$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -1397,7 +1393,7 @@ class MultigridMobileController extends Controller{
             echo '  </div>';
 			
 			// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
-			if($mobile_tables == 2)
+			if($tables_setting == 2)
 				echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
             
 			echo '</div>';
diff --git a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php
index ddec09520..32aac2383 100644
--- a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php
+++ b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php
@@ -231,7 +231,9 @@ class VprasanjaController extends Controller
 		// JS za mobilno razpiranje tabel
 		SurveySetting::getInstance()->Init(get('anketa'));
 		$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
-		if($mobile_tables == 2){
+        $pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
+                
+		if(($mobile_tables == 2 && get('mobile') == 1) || ($pc_tables == 2 && get('mobile') != 1)){
 			
 			echo '<script>
                     $(document).ready(
@@ -704,7 +706,8 @@ class VprasanjaController extends Controller
                 
                 SurveySetting::getInstance()->Init(get('anketa'));
                 $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
-
+                $pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
+                
                 // Izris multigrida s postopnim resevanjem
                 if($row['dynamic_mg'] > 0 && !get('printPreview')){
                     
@@ -714,7 +717,7 @@ class VprasanjaController extends Controller
                         Dynamic::getInstance()->verticalMultigrid($spremenljivka);
                 }
                 // Izris radio multigrida na mobitelu
-                elseif (get('mobile') == 1 && $mobile_tables > 0) {
+                elseif ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
                     
 					// Dvojni multigrid
 					if($row['enota'] == 3)
@@ -778,9 +781,10 @@ class VprasanjaController extends Controller
 
                 SurveySetting::getInstance()->Init(get('anketa'));
                 $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+                $pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 
                 // Izris checkbox multigrida na mobitelu
-                if (get('mobile') == 1 && $mobile_tables > 0) {
+                if ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
                     
 					// Dvojni multigrid
 					if($row['enota'] == 3)
@@ -823,9 +827,10 @@ class VprasanjaController extends Controller
 
                 SurveySetting::getInstance()->Init(get('anketa'));
                 $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+                $pc_tables = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
 
                 // Izris text in number multigrida na mobitelu
-                if (get('mobile') == 1 && $mobile_tables > 0) {
+                if ((get('mobile') == 1 && $mobile_tables > 0) || (get('mobile') != 1 && $pc_tables > 0)) {
                     MultigridMobile::getInstance()->textMultigrid($spremenljivka);
                 }
                 // Izris navadnega text in number multigrida
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 0498b53f6..9a1c1f257 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10016,8 +10016,9 @@ textarea:focus {
 }
 .box-container .num_box {
   border: 1px solid #E5E5E5;
-  background-color: #FFFF;
+  background-color: white;
   border-radius: 2px;
+  cursor: pointer;
   margin: 0px;
   padding: 0px;
 }
@@ -10173,41 +10174,43 @@ div .table-horizontal-scroll-wrapper2 table {
   padding: 0px;
 }
 
-.page_num_fieldset {
+#anketa_edit .page_num_fieldset {
   padding-top: 0px;
   padding-bottom: 0px;
-  margin: 12px 0px;
+  margin: 0px;
 }
-
-.page_num {
-  margin-left: 39%;
+#anketa_edit .page_num {
+  text-align: center;
   color: #333333;
   position: relative;
+  margin: 4px 0px;
 }
-
-.table_header {
+#anketa_edit .table_header {
   width: 100%;
   margin: 16px 0px 0px 0px;
+  background-color: #F8F8F8;
   font-size: 16px;
   font-weight: 600;
 }
-.table_header tr {
+#anketa_edit .table_header tr {
   width: 100%;
 }
-.table_header tr td:first-of-type {
-  width: 40%;
+#anketa_edit .table_header tr td:first-of-type {
+  width: 46%;
   padding-left: 16px;
 }
-.table_header tr td:last-of-type {
-  width: 60%;
+#anketa_edit .table_header tr td:last-of-type {
+  width: 54%;
   padding-left: 16px;
 }
-
-.avt_vnosi_table td:first-of-type {
-  width: 40%;
+#anketa_edit .avt_vnosi_table {
+  margin: 0px;
 }
-.avt_vnosi_table td:last-of-type {
-  width: 60%;
+#anketa_edit .avt_vnosi_table td:first-of-type {
+  width: 46%;
+}
+#anketa_edit .avt_vnosi_table td:last-of-type {
+  width: 54%;
 }
 
 /*
@@ -10475,9 +10478,9 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 div.button_holder.editor_button_holder {
   margin: 0;
   padding: 8px 16px;
-  border-bottom: 1px #cccccc solid;
-  border-left: 1px #cccccc solid;
-  border-right: 1px #cccccc solid;
+  border-bottom: 1px rgb(204, 204, 204) solid;
+  border-left: 1px rgb(204, 204, 204) solid;
+  border-right: 1px rgb(204, 204, 204) solid;
   border-radius: 0 0 2px 2px;
 }
 
@@ -20936,10 +20939,10 @@ div.page_tema div.theme_list div.options div.buttons-window {
   position: absolute;
   bottom: 20px;
   max-width: 113px;
-  box-shadow: 0px 0px 7px 0px #0000001F;
+  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
   border-radius: 2px;
   margin-right: 5px;
-  background-color: #FFFF;
+  background-color: white;
 }
 div.page_tema div.theme_list div.options div.buttons-window .button {
   border: none;
@@ -21234,7 +21237,7 @@ div#theme-edit-wrap div#theme-editor #picker {
   left: 500px;
   z-index: 999;
   border-radius: 2px;
-  box-shadow: 0px 0px 7px 0px #0000001F;
+  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
 }
 div#theme-edit-wrap div#theme-editor #picker .popup_close {
   position: absolute !important;
@@ -25909,7 +25912,6 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
-
   div#vabila div.more div.more_block {
     width: 89% !important;
   }
@@ -30049,7 +30051,6 @@ iframe#ifmcontentstoprint {
   position: absolute;
   left: 17px;
   top: 40px;
-  box-shadow: 0px 0px 7px 0px #0000001F;
 }
 #div_analiza_data .faicon.dots {
   cursor: pointer;
@@ -30066,7 +30067,7 @@ iframe#ifmcontentstoprint {
 .analysis_icons_holder {
   background-color: white;
   border-radius: 2px;
-  box-shadow: 0px 0px 7px 0px #0000001F;
+  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
 }
 .analysis_icons_holder .icon_box {
   margin-left: 16px;
@@ -30120,6 +30121,11 @@ iframe#ifmcontentstoprint {
   padding-bottom: 16px;
 }
 
+@media only screen and (max-width: 850px) {
+  .analysis_icons_holder {
+    display: block !important;
+  }
+}
 .cell_icons button::before {
   font-weight: 700;
   content: "\f141";
@@ -30350,15 +30356,15 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
 }
 
 .rsdl_bck1 {
-  background-color: #fae2e2 !important;
+  background-color: rgb(250, 226, 226) !important;
 }
 
 .rsdl_bck2 {
-  background-color: #ff9d9d !important;
+  background-color: rgb(255, 157, 157) !important;
 }
 
 .rsdl_bck3 {
-  background-color: #f84242 !important;
+  background-color: rgb(248, 66, 66) !important;
 }
 
 .rsdl_bck4 {
@@ -33846,24 +33852,19 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
-
   #firstNavigation ol.right-side {
     display: none;
   }
-
   div.status_advanced {
     flex-direction: column;
   }
-
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
-
   a.status_advanced_link {
     width: 95%;
   }
-
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -33957,7 +33958,6 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
-
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -33987,44 +33987,36 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
-
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
-
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
-
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
-
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
-
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
-
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
-
   .top_note {
     padding: 8px 16px;
   }
-
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -34280,7 +34272,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
-
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -34302,7 +34293,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
-
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -34313,7 +34303,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
-
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -34324,12 +34313,10 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
-
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
-
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -34404,7 +34391,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
-
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -34488,7 +34474,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
-
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -34501,19 +34486,16 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
-
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
-
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
-
   #branching {
     width: 100%;
     margin: 0;
@@ -34618,11 +34600,9 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
-
   .toolbox_holder {
     display: none;
   }
-
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -34642,7 +34622,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
-
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -34696,7 +34675,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
-
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -34749,7 +34727,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
-
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -34762,7 +34739,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
-
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -34778,18 +34754,15 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
-
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
-
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
-
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -34807,7 +34780,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
-
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -34834,7 +34806,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
-
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -34842,7 +34813,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
-
   #srv_diagnostic br {
     display: none;
   }
@@ -34863,7 +34833,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
-
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -34877,7 +34846,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
-
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -34885,7 +34853,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
-
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34910,7 +34877,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
-
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -34978,7 +34944,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
-
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -35062,7 +35027,6 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
-
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -35070,7 +35034,6 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
-
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -35109,7 +35072,6 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
-
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -35130,7 +35092,6 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
-
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -35142,7 +35103,6 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
-
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -35157,11 +35117,9 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
-
   #inv_field_container ul li {
     width: 45%;
   }
-
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -35173,7 +35131,6 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
-
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -35244,11 +35201,9 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
-
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
-
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -35289,7 +35244,6 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
-
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -35309,7 +35263,6 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
-
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -35319,16 +35272,13 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
-
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
-
   .analysis_icons_holder {
     display: none;
   }
-
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -35351,7 +35301,6 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
-
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -35368,14 +35317,12 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
-
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
-
   .noSurvey_sequence {
     padding: 0;
   }
@@ -35397,13 +35344,11 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
-
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
-
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -35414,7 +35359,6 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
-
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/public/css/main.css b/public/css/main.css
index 119ee12bc..42f480492 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -5751,6 +5751,9 @@ span.enka-custom-radio:before,
   padding: 3px;
   margin-bottom: 20px !important;
 }
+.spremenljivka.tip_6, .spremenljivka.tip_16, .spremenljivka.tip_19, .spremenljivka.tip_20, .spremenljivka.tip_24 {
+  /* Mobilno rzpiranje tabel */
+}
 .spremenljivka.tip_6 input[type=text], .spremenljivka.tip_6 textarea, .spremenljivka.tip_6 select, .spremenljivka.tip_16 input[type=text], .spremenljivka.tip_16 textarea, .spremenljivka.tip_16 select, .spremenljivka.tip_19 input[type=text], .spremenljivka.tip_19 textarea, .spremenljivka.tip_19 select, .spremenljivka.tip_20 input[type=text], .spremenljivka.tip_20 textarea, .spremenljivka.tip_20 select, .spremenljivka.tip_24 input[type=text], .spremenljivka.tip_24 textarea, .spremenljivka.tip_24 select {
   padding: 5px 7px;
 }
@@ -5791,6 +5794,153 @@ span.enka-custom-radio:before,
 .spremenljivka.tip_6 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_16 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_19 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_20 table.dynamicmultigrid tbody tr:nth-child(2n+1), .spremenljivka.tip_24 table.dynamicmultigrid tbody tr:nth-child(2n+1) {
   background-color: #ffffff !important;
 }
+.spremenljivka.tip_6 .grid_mobile .grid_mobile_question, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question {
+  margin: 10px 0 15px;
+  /*line-height: 24px;*/
+}
+.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_title, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_title {
+  padding: 7px 9px;
+  font-weight: 500;
+}
+.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables {
+  width: 100%;
+  box-sizing: border-box;
+}
+.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 7px 9px;
+  margin: 2px 0;
+  color: #333333;
+  border: 1px #fff solid;
+  border-radius: 3px;
+}
+.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_variables .grid_mobile_variable label {
+  vertical-align: baseline;
+}
+.spremenljivka.tip_6 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_16 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_19 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_20 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle, .spremenljivka.tip_24 .grid_mobile .grid_mobile_question .grid_mobile_double_subtitle {
+  padding: 5px 8px;
+}
+.spremenljivka.tip_6 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_6 .grid_mobile.checkbox .grid_mobile_variable.checked,
+.spremenljivka.tip_6 .grid_mobile.radio .grid_mobile_variable:hover,
+.spremenljivka.tip_6 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_16 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_16 .grid_mobile.checkbox .grid_mobile_variable.checked,
+.spremenljivka.tip_16 .grid_mobile.radio .grid_mobile_variable:hover,
+.spremenljivka.tip_16 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_19 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_19 .grid_mobile.checkbox .grid_mobile_variable.checked,
+.spremenljivka.tip_19 .grid_mobile.radio .grid_mobile_variable:hover,
+.spremenljivka.tip_19 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_20 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_20 .grid_mobile.checkbox .grid_mobile_variable.checked,
+.spremenljivka.tip_20 .grid_mobile.radio .grid_mobile_variable:hover,
+.spremenljivka.tip_20 .grid_mobile.radio .grid_mobile_variable.checked, .spremenljivka.tip_24 .grid_mobile.checkbox .grid_mobile_variable:hover, .spremenljivka.tip_24 .grid_mobile.checkbox .grid_mobile_variable.checked,
+.spremenljivka.tip_24 .grid_mobile.radio .grid_mobile_variable:hover,
+.spremenljivka.tip_24 .grid_mobile.radio .grid_mobile_variable.checked {
+  background-color: #efefef;
+  border: 1px #E2E2E2 solid;
+}
+.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
+.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
+.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
+.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
+.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable,
+.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable {
+  display: inline-block;
+  border: 0;
+}
+.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
+.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
+.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
+.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
+.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
+.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
+.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
+.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
+.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable:hover, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable.checked,
+.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable:hover,
+.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable.checked {
+  background-color: #fff;
+  border: 0;
+}
+.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_6 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
+.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_6 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_16 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
+.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_16 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_19 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
+.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_19 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_20 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
+.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_20 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table, .spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_24 .grid_mobile.radio.visual_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table,
+.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .visual-radio-table,
+.spremenljivka.tip_24 .grid_mobile.radio.smiley_scale .grid_mobile_variables .grid_mobile_variable .custom-radio-table {
+  display: inline-block !important;
+}
+.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable input[type=text],
+.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable input[type=email],
+.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable input[type=text],
+.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable input[type=text],
+.spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable input[type=email],
+.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable input[type=text],
+.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable input[type=text],
+.spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable input[type=email],
+.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable input[type=text],
+.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable input[type=text],
+.spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable input[type=email],
+.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable input[type=text],
+.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable input[type=email], .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable input[type=text],
+.spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable input[type=email],
+.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable input[type=text],
+.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable input[type=email] {
+  box-sizing: border-box;
+  width: 100%;
+  padding: 10px;
+}
+.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable textarea,
+.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable textarea,
+.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable textarea,
+.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable textarea,
+.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable textarea, .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable textarea,
+.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable textarea {
+  box-sizing: border-box;
+  width: 100%;
+  max-width: 100% !important;
+  padding: 10px;
+}
+.spremenljivka.tip_6 .grid_mobile.text .grid_mobile_variable .category > div,
+.spremenljivka.tip_6 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_16 .grid_mobile.text .grid_mobile_variable .category > div,
+.spremenljivka.tip_16 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_19 .grid_mobile.text .grid_mobile_variable .category > div,
+.spremenljivka.tip_19 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_20 .grid_mobile.text .grid_mobile_variable .category > div,
+.spremenljivka.tip_20 .grid_mobile.number .grid_mobile_variable .category > div, .spremenljivka.tip_24 .grid_mobile.text .grid_mobile_variable .category > div,
+.spremenljivka.tip_24 .grid_mobile.number .grid_mobile_variable .category > div {
+  max-height: 60px;
+}
+.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title {
+  cursor: pointer;
+  display: flex;
+  justify-content: space-between;
+}
+.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow {
+  font-family: "Font Awesome 5 Free";
+  font-weight: 700;
+  font-size: 18px;
+  padding-left: 10px;
+}
+.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_down::before {
+  content: "";
+}
+.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_title .faicon.mobile_expanding_arrow.arrow_up::before {
+  content: "";
+}
+.spremenljivka.tip_6 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_16 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_19 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_20 .grid_mobile.mobile_expanding .grid_mobile_result, .spremenljivka.tip_24 .grid_mobile.mobile_expanding .grid_mobile_result {
+  display: none;
+  margin: 0px 30px 0 10px;
+  font-size: 13px;
+  color: #999;
+  line-height: 20px;
+  font-weight: 500;
+}
 .spremenljivka.tip_17 select {
   padding: 8px 12px;
   margin-right: 15px;
diff --git a/resources/sass/admin_new/components/form/seznam_anket.scss b/resources/sass/admin_new/components/form/seznam_anket.scss
index 026bccf14..49fffb060 100644
--- a/resources/sass/admin_new/components/form/seznam_anket.scss
+++ b/resources/sass/admin_new/components/form/seznam_anket.scss
@@ -13,6 +13,7 @@
         border: 1px solid #E5E5E5;
         background-color: #FFFF;
         border-radius: 2px;
+        cursor: pointer;
 
         margin: 0px;
         padding: 0px;
diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss
index 009370b3e..c3316f5e0 100644
--- a/resources/sass/admin_new/components/table/table.scss
+++ b/resources/sass/admin_new/components/table/table.scss
@@ -112,51 +112,67 @@ div {
     border-top: 1px dashed #E5E5E5;
     padding: 0px;
 
+
+
+
 }
 
-.page_num_fieldset{
-    padding-top: 0px;
-    padding-bottom: 0px;
+#anketa_edit {
 
-    margin: 12px 0px;
-}
+    .page_num_fieldset{
+        padding-top: 0px;
+        padding-bottom: 0px;
+    
+        margin: 0px;
+    }
+    
+    .page_num{
+        text-align: center;
+        color: #333333;
+        position: relative;
 
-.page_num{
-    margin-left: 39%;
-    color: #333333;
-    position: relative;
-}
-
-
-
-.table_header{
-    width: 100%;
-    margin: 16px 0px 0px 0px;
-
-    font-size: 16px;
-    font-weight: 600;
-
-    tr{
+        margin: 4px 0px;
+    }
+    
+    
+    
+    .table_header{
         width: 100%;
+        margin: 16px 0px 0px 0px;
+        background-color: #F8F8F8;
+    
+        font-size: 16px;
+        font-weight: 600;
+    
+        tr{
+            width: 100%;
+    
+    
+            td:first-of-type {
+                width: 46%;
+                padding-left: 16px;
+            }
+            td:last-of-type {
+                width: 54%;
+                padding-left: 16px;
+            }
+        }
+    }
+    
+    .avt_vnosi_table{
 
+        margin: 0px;
 
+        
         td:first-of-type {
-            width: 40%;
-            padding-left: 16px;
+            width: 46%;
         }
         td:last-of-type {
-            width: 60%;
-            padding-left: 16px;
+            width: 54%;
         }
     }
+    
 }
 
-.avt_vnosi_table{
-    td:first-of-type {
-        width: 40%;
-    }
-    td:last-of-type {
-        width: 60%;
-    }
-}
+
 
diff --git a/resources/sass/admin_new/pages/survey_analysis/icons.scss b/resources/sass/admin_new/pages/survey_analysis/icons.scss
index cc8570d79..1ab7b90f9 100644
--- a/resources/sass/admin_new/pages/survey_analysis/icons.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/icons.scss
@@ -14,7 +14,7 @@
         left: 17px;
         top: 40px;
         
-        box-shadow: 0px 0px 7px 0px #0000001F;
+        
     }
 
     .faicon.dots {
@@ -127,6 +127,11 @@
     
 }
 
+@media only screen and (max-width: 850px) {
+    .analysis_icons_holder {
+      display: block !important;
+    }
+}
 
 
 
diff --git a/resources/sass/main/main/content.scss b/resources/sass/main/main/content.scss
index 4af64af46..d2585f5f1 100644
--- a/resources/sass/main/main/content.scss
+++ b/resources/sass/main/main/content.scss
@@ -230,7 +230,7 @@
     &.tip_16,
     &.tip_19,
     &.tip_20,
-    &.tip_24{
+    &.tip_24{				
 
         input[type="text"], textarea, select {
             padding: 5px 7px;
@@ -282,6 +282,156 @@
         table.dynamicmultigrid tbody tr:nth-child(2n+1) {
             background-color: #ffffff !important;
         }
+
+        .grid_mobile{
+						
+            .grid_mobile_question{
+                margin: 10px 0 15px;
+                
+                /*line-height: 24px;*/
+                
+                .grid_mobile_title{
+                    padding: 7px 9px;
+                
+                    font-weight: 500;
+                }
+                
+                .grid_mobile_variables{
+                    width: 100%;
+                    box-sizing: border-box;
+                    
+                    .grid_mobile_variable{
+                        width: 100%;
+                        height: 100%;
+                        box-sizing: border-box;
+                        
+                        padding: 7px 9px;
+                        margin: 2px 0;
+                        
+                        color: #333333;
+                        
+                        border: 1px #fff solid;
+                        border-radius: 3px;
+                                                            
+                        label{
+                            vertical-align: baseline;
+                        }
+                    
+                        .grid_mobile_variable_title{
+                        
+                        }
+                    }
+                }
+
+                .grid_mobile_double_subtitle{
+                    padding: 5px 8px;
+                }
+            }
+        }
+        
+        .grid_mobile.checkbox,
+        .grid_mobile.radio{
+
+            .grid_mobile_variable{
+
+                &:hover,
+                &.checked{
+                    background-color: #efefef;
+                    border: 1px #E2E2E2 solid;						
+                }
+            }
+        }
+
+        .grid_mobile.radio.visual_scale,
+        .grid_mobile.radio.smiley_scale{
+
+            .grid_mobile_variables{
+                //width: auto !important;
+
+                .grid_mobile_variable{
+                    display: inline-block;
+                    //width: auto !important;
+
+                    border: 0;	
+
+                    &:hover,
+                    &.checked{
+                        background-color: #fff;
+                        border: 0;		
+                    }
+
+                    .visual-radio-table,
+                    .custom-radio-table{
+                        display: inline-block !important;
+                    }
+                }
+            }
+        }
+
+        .grid_mobile.text,
+        .grid_mobile.number{
+
+            .grid_mobile_variable{
+
+                input[type="text"],
+                input[type="email"]{
+                    box-sizing: border-box;
+
+                    width: 100%;           
+                    padding: 10px;
+                }
+
+                textarea{
+                    box-sizing: border-box;
+
+                    width: 100%;
+                    max-width: 100% !important;
+                    padding: 10px;
+                }
+
+                .category > div{
+                    max-height: 60px; 
+                }
+            }
+        }
+        
+        /* Mobilno rzpiranje tabel */
+        .grid_mobile.mobile_expanding{
+            
+            .grid_mobile_title{
+                cursor: pointer;
+                display: flex;
+                justify-content: space-between;
+                
+                .faicon.mobile_expanding_arrow{
+                    font-family: $fontawesome;
+                    font-weight: 700;
+                    font-size: 18px;
+                    
+                    padding-left: 10px;
+                    
+                    &.arrow_down::before{
+                        content: "\f078";
+                    }
+                
+                    &.arrow_up::before{
+                        content: "\f077";
+                    }
+                
+                }
+            }
+            
+            .grid_mobile_result{
+                display: none;
+                
+                margin: 0px 30px 0 10px;
+
+                font-size: 13px;
+                color: #999;
+                line-height: 20px;
+                font-weight: 500;
+            }
+        }
     }
     /* END TIP TABELA */
 
diff --git a/sql/update2.sql b/sql/update2.sql
index baa0d9214..069d28d19 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9656,3 +9656,7 @@ CREATE TABLE IF NOT EXISTS srv_spremenljivka_deleted (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 UPDATE misc SET value='22.08.05' WHERE what="version";
+
+INSERT INTO srv_misc (what, value) VALUES ('pc_tables', '1');
+
+UPDATE misc SET value='22.08.25' WHERE what="version";