diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 6c0b2b033..732e27230 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -5859,66 +5859,39 @@ class Branching {
 		echo '      <table class="grid_header_table '.($this->lang_id==null?'allow_new':'').'">';
 		echo '        <thead>';
 
+
 		// podnaslovi gridov
-		if ($row['grid_subtitle1'] == '1') {
-			echo '        <tr>';
+        $sql2 = sisplet_query("SELECT s.id, s.naslov, s.grids FROM srv_spremenljivka s, srv_grid_multiple m WHERE s.id = m.spr_id AND parent = '".$row['id']."' ORDER BY m.vrstni_red");
+		if ($row['grid_subtitle1'] == '1' && mysqli_num_rows($sql2) > 0) {
+			
+            echo '        <tr class="row_subtitle">';
 			echo '          <td></td>';
-			//echo '          <td style="width:' . $spacesize . '%"></td>';
 			echo '          <td></td>';
 
-			$sql2 = sisplet_query("SELECT s.id, s.naslov, s.grids FROM srv_spremenljivka s, srv_grid_multiple m WHERE s.id = m.spr_id AND parent = '".$row['id']."' ORDER BY m.vrstni_red");
 			while ($row2 = mysqli_fetch_array($sql2)) {
-				
-				
+							
  				if ($this->lang_id != null) {
 					save('lang_id', $this->lang_id);					
 					$rowl = \App\Controllers\LanguageController::srv_language_spremenljivka($row2['id']);					
 					if (strip_tags($rowl['naslov']) != '') $row2['naslov'] = $rowl['naslov'];
-				}				
-				
-
-				echo '          <td colspan="'.$row2['grids'].'" class="grid_header" grd="g_'.$row2['id'].'"><div class="naslov_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row2['id'].'" '.(strpos($row2['naslov'], $lang['srv_new_vprasanje'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
+				}						
 
+				echo '          <td colspan="'.$row2['grids'].'" class="grid_header" grd="g_'.$row2['id'].'"><div class="naslov_inline grid_subtitle_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" spr_id="'.$row2['id'].'" '.(strpos($row2['naslov'], $lang['srv_new_vprasanje'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '</div></td>';
 			}
 
 			echo '        </tr>';
 		}
 
-		// urejanje vrednosti
-		echo '        <tr id="grid_variable_'.$row['id'].'" '.$show_variable_row.'>';
-		echo '          <td></td>';
-		//echo '          <td style="width:' . $spacesize . '%"></td>';
-		echo '          <td></td>';
 
 		$bg = 1;
 
-		$sql2 = sisplet_query("SELECT id, variable, vrstni_red FROM srv_grid WHERE spr_id='$row[id]' AND other=0 ORDER BY vrstni_red");
-		$row2 = mysqli_fetch_array($sql2);
-
-		for ($i = 1; $i <= $row['grids']; $i++) {
-			if ($row2['vrstni_red'] == $i) {
-				echo '          <td class=" ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" grd="g_'.$row2['id'].'"><div class="grid_variable_inline" '.$show_variable_inline.' contenteditable="'.(!$locked?'true':'false').'" tabindex="1" grd_id="'.$row2['id'].'">' . $row2['variable'] . '</div></td>';
-				$row2 = mysqli_fetch_array($sql2);
-			} 
-            else {
-				echo '          <td class=" ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"></td>';
-			}
-		}
-		echo '</tr>';
-
-		$grid_plus_minus = '<div class="grid-plus-minus"><a href="#" onclick="grid_multiple_add(\''.$row['id'].'\'); return false;" title="'.$lang['srv_gridmultiple_add'].'">'.$lang['add'].' <span class="faicon add icon-blue"></span></a></div>';
-		
-		echo '        <tr>';
-		echo '          <td></td>';
-		//echo '          <td style="width:' . $spacesize . '%"></td>';
-		echo '          <td></td>';
-
-		$bg = 1;
-
-		//$sql2 = sisplet_query("SELECT g.* FROM srv_grid g, srv_grid_multiple m WHERE g.spr_id = m.spr_id AND parent = '".$row['id']."' ORDER BY m.vrstni_red, g.vrstni_red");
-
 		$sqlM = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka' ORDER BY vrstni_red");
 		if(mysqli_num_rows($sqlM) > 0){
+
+            echo '        <tr>';
+            echo '          <td></td>';
+            echo '          <td></td>';
+            
 			$multiple = array();
 			while ($rowM = mysqli_fetch_array($sqlM)) {
 				$multiple[] = $rowM['spr_id'];
@@ -5939,24 +5912,16 @@ class Branching {
 					echo '          <td class="grid_header ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"></td>';
 				}
 			}
-		}
 
-		#kateri missingi so nastavljeni
-		$sql_grid_mv = sisplet_query("SELECT * FROM srv_grid WHERE spr_id='".$spremenljivka."' AND other != 0");
-		if (mysqli_num_rows($sql_grid_mv) > 0 ) {
-			echo '<td class=""></td>';
-			while ($row_grid_mv = mysqli_fetch_array($sql_grid_mv)) {
-				echo '<td class="grid_header ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" grd="g_'.$row_grid_mv['id'].'"><div class="grid_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" grd_id="'.$row_grid_mv['id'].'" '.(strpos($row_grid_mv['naslov'], $lang['srv_new_grid'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row_grid_mv['naslov'] . '</div></td>';
-
-			}
+            echo '        </tr>';
 		}
-		echo '        </tr>';
 
 
 		// linki za urejanje pod-spremenljivk tabele
+        $grid_plus_minus = '<div class="grid-plus-minus"><a href="#" class="noline" onclick="grid_multiple_add(\''.$row['id'].'\'); return false;" title="'.$lang['srv_gridmultiple_add'].'"><span class="faicon add icon-blue"></span><span>'.$lang['add'].'</span></a></div>';
+
 		echo '        <tr class="sub-table">';
 		echo '          <td>'.$grid_plus_minus.'</td>';
-		//echo '          <td style="width:' . $spacesize . '%"></td>';
 		echo '          <td></td>';
 
 		$bg = 1;
@@ -5972,7 +5937,9 @@ class Branching {
 			if ($tip_prev != $row2['tip']) $col++;
 				$tip_prev = $row2['tip'];
 
-			echo '          <td class="grid_header ' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" colspan="'.$row2['grids'].'"><a href="#" onclick="grid_multiple_edit(\''.$row['id'].'\', \''.$row2['id'].'\'); return false;">'.$lang['edit3'].'</a></td>';
+			echo '          <td class="grid_header ' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" colspan="'.$row2['grids'].'">';
+            echo '              <div class="grid-subtable-edit"><a href="#" class="noline" onclick="grid_multiple_edit(\''.$row['id'].'\', \''.$row2['id'].'\'); return false;">'.$lang['edit3'].'</a></div>';
+            echo '          </td>';
 
 			$id_prev = $row2['id'];
 		}
@@ -6046,20 +6013,22 @@ class Branching {
 				if ($tip_prev != $row2['tip']) $col++;
 				$tip_prev = $row2['tip'];
 
+                // Radio podtabela
 				if($row2['tip'] == 6) {
-					//echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '">'.($row2['enota']!=2?'<input type="radio" name="foo_' . $row1['id'] . '" value="">':'').'</td>';
 					echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '">'.(($row2['enota']!=2 && $row2['enota']!=6)?'<input type="radio" class="enka-admin-custom" name="foo_' . $row1['id'] . '" value=""><span class="enka-checkbox-radio"></span>':'').'</td>';
-
-				} elseif($row2['tip'] == 16) {
-					//echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="checkbox" name="foo_' . $row1['id'] . '" value=""></td>';
+				} 
+                // Checkbox podtabela
+                elseif($row2['tip'] == 16) {
 					echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '">'.(($row2['enota']!=2 && $row2['enota']!=6)?'<input type="checkbox" class="enka-admin-custom" name="foo_' . $row1['id'] . '" value=""><span class="enka-checkbox-radio"></span>':'').'</td>';
+				} 
+                // Text podtabela
+                elseif ($row2['tip'] == 19) {
+					echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="text" class="small" name="foo_' . $row1['id'] . '" value=""></td>';
+				} 
+                // Number podtabela
+                elseif ($row2['tip'] == 20) {
 
-				} elseif ($row2['tip'] == 19) {
-					echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><textarea style="width:3em; height:12px" name="foo_' . $row1['id'] . '"></textarea></td>';
-
-				} elseif ($row2['tip'] == 20) {
-
-					echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="text" style="width:'.$taWidth.'em;" name="foo_' . $row1['id'] . '" value="">';
+					echo '          <td style="width:' . $cellsize . '%" class="' .($id_prev!=$row2['id']?'col_border ':'').($col%2==0?'col_dark ':'') . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="text" class="small" name="foo_' . $row1['id'] . '" value="">';
 
 					if ($row['ranking_k'] == 1) {
 						echo '<div style="width:100%">';
@@ -6073,7 +6042,6 @@ class Branching {
 
 						echo '</div>';
 
-						//<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/base/jquery-ui.css" type="text/css" media="all" />
 						?>
 						<script>
 							$(function() {
@@ -6092,17 +6060,20 @@ class Branching {
 			#kateri missingi so nastavljeni
 			$sql_grid_mv = sisplet_query("SELECT id FROM srv_grid WHERE spr_id='".$spremenljivka."' AND other != 0");
 			if (mysqli_num_rows($sql_grid_mv) > 0 ) {
-				//echo '<td style="width:' . $spacesize . '%"></td>';
-				echo '<td></td>';
+
+                echo '<td></td>';
+
 				while ($row_grid_mv = mysqli_fetch_array($sql_grid_mv)) {
-					if($row['tip'] == 6) {
+					
+                    if($row['tip'] == 6) {
 						echo '          <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="radio" class="enka-admin-custom"  name="foo_' . $row1['id'] . '" value="" /><span class="enka-checkbox-radio"></span></td>';
-					} elseif($row['tip'] == 16) {
+					} 
+                    elseif($row['tip'] == 16) {
 						echo '          <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="checkbox" class="enka-admin-custom" name="foo_' . $row1['id'] . '" value="" /><span class="enka-checkbox-radio"></span></td>';
-					} else {
+					} 
+                    else {
 						echo '          <td style="width:' . $cellsize . '%" class="' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '"><input type="radio" class="enka-admin-custom" name="foo_' . $row1['id'] . '" value="" /><span class="enka-checkbox-radio"></span></td>';
 					}
-
 				}
 			}
 
@@ -6112,6 +6083,10 @@ class Branching {
 				echo '          <td></td>';
 				echo '          <td style="text-align:left;" class="grid_question ' . ($bg % 2 == 0 ? 'grid_light' : 'grid_dark') . '" id="f_'.$row1['id'].'_2"><div class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'_2" '.(strpos($row1['naslov2'], $lang['srv_new_vrednost'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $row1['naslov2'] . '</div></td>';
 			}
+
+            // Zadnja bela celica kjer se nahajajo ikone za mouseover
+			echo '<td class="white" style="min-width:80px;"></td>';
+
 			echo '        </tr>';
 
 			$bg++;
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index 00afe1578..9bf277f40 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -742,7 +742,7 @@ function init_toolbox() {
     }).bind('click', function (event) {
 
         var ta = $(event.target);
-        ta = $(ta).closest('div');
+        ta = $(ta).closest('.new_spr, .new_adv, .new_if, .new_block, .new_loop');
         
         if (ta.hasClass('new_spr')) {				// nova spremenljivka (iz toolboxa)
             
@@ -778,9 +778,12 @@ function init_toolbox() {
         }
 
         $('#toolbox_add_advanced').addClass('dragging');
+        
         setTimeout(function () {
             $('#toolbox_add_advanced').removeClass('dragging');
         }, 500);
+
+        event.stopPropagation();
     });
 
     // mousever preview vprasanja
diff --git a/admin/survey/script/vprasanjeInline.js b/admin/survey/script/vprasanjeInline.js
index 026eb0e75..a2d14bf8e 100644
--- a/admin/survey/script/vprasanjeInline.js
+++ b/admin/survey/script/vprasanjeInline.js
@@ -454,9 +454,7 @@ function inline_textfield (spremenljivka, _this) {
 
 // shrani vsebino za hotspot vprasanje
 function inline_hotspot (spremenljivka, _this) {
-	
-	//if ($(_this).attr('contenteditable') != 'true') return;
-	
+		
 	// Pocistimo text pri copy/paste
 	if(pasteFromWord == true){
 		inline_clear_paste(_this);	
@@ -506,21 +504,16 @@ function inline_vrednost (spremenljivka, _this) {
 	if(pasteFromWord == true){
 		inline_clear_paste(_this);	
 	}
-	//var vnosi = $('#spremenljivka_contentdiv3444 div.variabla').length;
-	//var vnosi = $('#variable_holder div.variabla').length;
-	//var vnosi = $('.edit_mode div.variabla').length;
-	var vnosi = $('.edit_mode div.vrednost_inline').length;
-	//console.log(spremenljivka);
-	//console.log(vnosi);
 
-        // dodatek may: shranimo vrednost textaree in inputa pri text fieldih
-        if ($(_this).attr('ETF') == 'true') {
-            $.post('ajax.php?t=vprasanjeinline&a=inline_vrednost_naslov_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).val()} );
-        }
-        else {
-            $.post('ajax.php?t=vprasanjeinline&a=inline_vrednost_naslov_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).html()} );
-        }
-	//$.post('ajax.php?t=vprasanjeinline&a=inline_vrednost_naslov_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).html(), sbSize: vnosi});
+    var vnosi = $('.edit_mode div.vrednost_inline').length;
+
+    // dodatek may: shranimo vrednost textaree in inputa pri text fieldih
+    if ($(_this).attr('ETF') == 'true') {
+        $.post('ajax.php?t=vprasanjeinline&a=inline_vrednost_naslov_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).val()} );
+    }
+    else {
+        $.post('ajax.php?t=vprasanjeinline&a=inline_vrednost_naslov_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).html()} );
+    }
 }
 
 // shrani ime hotspot obmocja
@@ -532,14 +525,10 @@ function inline_hotspot_vrednost (spremenljivka, _this) {
 	if(pasteFromWord == true){
 		inline_clear_paste(_this);	
 	}
-	//var vnosi = $('#spremenljivka_contentdiv3444 div.variabla').length;
-	//var vnosi = $('#variable_holder div.variabla').length;
-	//var vnosi = $('.edit_mode div.variabla').length;
+
 	var vnosi = $('.edit_mode div.vrednost_inline').length;
-	//console.log(spremenljivka);
-	//console.log(vnosi);
-	$.post('ajax.php?t=vprasanjeinline&a=inline_hotspot_vrednost_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).html()} );
-	//$.post('ajax.php?t=vprasanjeinline&a=inline_vrednost_naslov_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).html(), sbSize: vnosi});
+
+    $.post('ajax.php?t=vprasanjeinline&a=inline_hotspot_vrednost_save', {spremenljivka:spremenljivka, vrednost: $(_this).attr('vre_id'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, naslov: $(_this).html()} );
 }
 // shrani grid vprasanja
 function inline_grid (spremenljivka, _this) {
@@ -552,7 +541,6 @@ function inline_grid (spremenljivka, _this) {
 	}
 
 	// String zaenkrat pustimo kot html
-	//var string = $(_this).text();
 	var string = $(_this).html();	
 	
 	// pri dvojni tabeli popravimo se desna polja
@@ -579,8 +567,8 @@ function inline_subtitle_grid (spremenljivka, _this) {
 	if(pasteFromWord == true){
 		inline_clear_paste(_this);	
 	}
-	//$.post('ajax.php?t=vprasanjeinline&a=inline_grid_subtitle_save', {spremenljivka: spremenljivka, subtitle: $(_this).attr('grid_subtitle'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, value: $(_this).html()});
-	$.post('ajax.php?t=vprasanjeinline&a=inline_grid_subtitle_save', {spremenljivka: spremenljivka, subtitle: $(_this).attr('grid_subtitle'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, value: $(_this).text(), grid_id: $(_this).attr('grid_id')});
+
+    $.post('ajax.php?t=vprasanjeinline&a=inline_grid_subtitle_save', {spremenljivka: spremenljivka, subtitle: $(_this).attr('grid_subtitle'), anketa: srv_meta_anketa_id, lang_id: srv_meta_lang_id, value: $(_this).text(), grid_id: $(_this).attr('grid_id')});
 }
 
 // pobrise vrednost (v srv_vrednost)
@@ -680,10 +668,9 @@ function inline_nova_vrednost (_this) {
 		
 	// ce je zadnje polje in ce lahko znotraj tega parenta dodajamo vrednosti
 	if ( $(_this).closest('.variabla').is(':last-child') && $(_this).closest('.variabla').parent().hasClass('allow_new') ) {
-
 		
 		// ce ni prazno (da pri novem ne dodamo takoj) && ce je attr new tudi ne dodamo, ker pocakamo da se zgenerira nov id
-		if ($(_this).html() != '' && $(_this).attr('vre_id') != 'new')  {
+		if ($(_this).html() != '' && $(_this).attr('vre_id') != 'new' && $(_this).attr('vre_id') != 'new_2')  {
 			
 			var spremenljivka = $(_this).closest('.spremenljivka_content').attr('spr_id'); //dobimo id spremenljivke
 			var orientation = $('#spremenljivka_content_'+spremenljivka).attr('spr_orientation'); //dobimo orientacijo iz dodanega parametra, ker iz prejsnje varianta ne gre, ko je urejevalno okno zaprto
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 75593a0ff..061ba6630 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -15419,6 +15419,9 @@ div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_ho
 div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus {
   display: none;
   justify-content: flex-end;
+  /*.faicon{
+      margin-right: 8px;
+  }*/
 }
 li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-plus-minus span,
 li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus span,
@@ -15452,6 +15455,39 @@ div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_ho
 div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus span {
   margin-left: 8px;
 }
+li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+li.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+li.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+li.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+li.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+li.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+li.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.jezik_row.tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.jezik_row.tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.jezik_row.tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.jezik_row.tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.jezik_row.tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.jezik_row.tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit,
+div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-subtable-edit,
+div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-subtable-edit {
+  display: none;
+  justify-content: center;
+}
 li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .vrednost_inline,
 li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid_variable_inline,
 li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid_inline,
@@ -16107,6 +16143,23 @@ div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_ho
   padding: 4px 6px;
   font-size: 14px;
 }
+li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+li.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+li.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+li.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.jezik_row.tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.jezik_row.tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.jezik_row.tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p,
+div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_subtitle td .grid_subtitle_inline p {
+  font-size: 14px;
+}
 li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_variable_inline,
 li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_variable_inline,
 li.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr.row_variable_inline,
@@ -16252,137 +16305,199 @@ div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_ho
   background-color: #F8F8F8;
 }
 li.spr_tip_6.spr_editing .grid-plus-minus,
+li.spr_tip_6.spr_editing .grid-subtable-edit,
 li.spr_tip_16.spr_editing .grid-plus-minus,
+li.spr_tip_16.spr_editing .grid-subtable-edit,
 li.spr_tip_19.spr_editing .grid-plus-minus,
+li.spr_tip_19.spr_editing .grid-subtable-edit,
 li.spr_tip_20.spr_editing .grid-plus-minus,
+li.spr_tip_20.spr_editing .grid-subtable-edit,
 li.spr_tip_24.spr_editing .grid-plus-minus,
+li.spr_tip_24.spr_editing .grid-subtable-edit,
 div.spr_tip_6.spr_editing .grid-plus-minus,
+div.spr_tip_6.spr_editing .grid-subtable-edit,
 div.spr_tip_16.spr_editing .grid-plus-minus,
+div.spr_tip_16.spr_editing .grid-subtable-edit,
 div.spr_tip_19.spr_editing .grid-plus-minus,
+div.spr_tip_19.spr_editing .grid-subtable-edit,
 div.spr_tip_20.spr_editing .grid-plus-minus,
+div.spr_tip_20.spr_editing .grid-subtable-edit,
 div.spr_tip_24.spr_editing .grid-plus-minus,
+div.spr_tip_24.spr_editing .grid-subtable-edit,
 div.jezik_row.tip_6.spr_editing .grid-plus-minus,
+div.jezik_row.tip_6.spr_editing .grid-subtable-edit,
 div.jezik_row.tip_16.spr_editing .grid-plus-minus,
+div.jezik_row.tip_16.spr_editing .grid-subtable-edit,
 div.jezik_row.tip_19.spr_editing .grid-plus-minus,
+div.jezik_row.tip_19.spr_editing .grid-subtable-edit,
 div.jezik_row.tip_20.spr_editing .grid-plus-minus,
-div.jezik_row.tip_24.spr_editing .grid-plus-minus {
+div.jezik_row.tip_20.spr_editing .grid-subtable-edit,
+div.jezik_row.tip_24.spr_editing .grid-plus-minus,
+div.jezik_row.tip_24.spr_editing .grid-subtable-edit {
   display: flex !important;
 }
-
-/*.spremenljivka_content[tip="24"] {
-	.variable_holder {
-		overflow-x: auto;
-	}
+li.spr_tip_6.spr_tip_24 .variable_holder, li.spr_tip_6.spr_tip_24 .variable_holder, li.spr_tip_6.jezik_row.tip_24 .variable_holder,
+li.spr_tip_16.spr_tip_24 .variable_holder,
+li.spr_tip_16.spr_tip_24 .variable_holder,
+li.spr_tip_16.jezik_row.tip_24 .variable_holder,
+li.spr_tip_19.spr_tip_24 .variable_holder,
+li.spr_tip_19.spr_tip_24 .variable_holder,
+li.spr_tip_19.jezik_row.tip_24 .variable_holder,
+li.spr_tip_20.spr_tip_24 .variable_holder,
+li.spr_tip_20.spr_tip_24 .variable_holder,
+li.spr_tip_20.jezik_row.tip_24 .variable_holder,
+li.spr_tip_24.spr_tip_24 .variable_holder,
+li.spr_tip_24.spr_tip_24 .variable_holder,
+li.spr_tip_24.jezik_row.tip_24 .variable_holder,
+div.spr_tip_6.spr_tip_24 .variable_holder,
+div.spr_tip_6.spr_tip_24 .variable_holder,
+div.spr_tip_6.jezik_row.tip_24 .variable_holder,
+div.spr_tip_16.spr_tip_24 .variable_holder,
+div.spr_tip_16.spr_tip_24 .variable_holder,
+div.spr_tip_16.jezik_row.tip_24 .variable_holder,
+div.spr_tip_19.spr_tip_24 .variable_holder,
+div.spr_tip_19.spr_tip_24 .variable_holder,
+div.spr_tip_19.jezik_row.tip_24 .variable_holder,
+div.spr_tip_20.spr_tip_24 .variable_holder,
+div.spr_tip_20.spr_tip_24 .variable_holder,
+div.spr_tip_20.jezik_row.tip_24 .variable_holder,
+div.spr_tip_24.spr_tip_24 .variable_holder,
+div.spr_tip_24.spr_tip_24 .variable_holder,
+div.spr_tip_24.jezik_row.tip_24 .variable_holder,
+div.jezik_row.tip_6.spr_tip_24 .variable_holder,
+div.jezik_row.tip_6.spr_tip_24 .variable_holder,
+div.jezik_row.tip_6.jezik_row.tip_24 .variable_holder,
+div.jezik_row.tip_16.spr_tip_24 .variable_holder,
+div.jezik_row.tip_16.spr_tip_24 .variable_holder,
+div.jezik_row.tip_16.jezik_row.tip_24 .variable_holder,
+div.jezik_row.tip_19.spr_tip_24 .variable_holder,
+div.jezik_row.tip_19.spr_tip_24 .variable_holder,
+div.jezik_row.tip_19.jezik_row.tip_24 .variable_holder,
+div.jezik_row.tip_20.spr_tip_24 .variable_holder,
+div.jezik_row.tip_20.spr_tip_24 .variable_holder,
+div.jezik_row.tip_20.jezik_row.tip_24 .variable_holder,
+div.jezik_row.tip_24.spr_tip_24 .variable_holder,
+div.jezik_row.tip_24.spr_tip_24 .variable_holder,
+div.jezik_row.tip_24.jezik_row.tip_24 .variable_holder {
+  overflow-x: auto;
 }
-.grid_header_table {
-	width: 100%;
-	text-align: center;
-	border-collapse: collapse;
-
-    thead{
-        tr{
-            td{
-                border: 0;
-
-                &.grid_header {
-                    height: 18px;  
-                }
-            }
-        }
-    }
-
-	tbody {
-		tr {
-			td {
-				padding-top: 3px;
-				padding-bottom: 3px;
-
-                border: 0;
-			}
-
-            &:nth-child(odd) {
-				background-color: $light-gray;
-
-                td {
-					background-color: $light-gray;
-
-                    div[contenteditable=true] {
-						border: 1px solid transparent;
-					}
-				}
-			}
-		}
-	}
+li.spr_tip_6.spr_tip_24 table tr td:first-child, li.spr_tip_6.spr_tip_24 table tr td:first-child, li.spr_tip_6.jezik_row.tip_24 table tr td:first-child,
+li.spr_tip_16.spr_tip_24 table tr td:first-child,
+li.spr_tip_16.spr_tip_24 table tr td:first-child,
+li.spr_tip_16.jezik_row.tip_24 table tr td:first-child,
+li.spr_tip_19.spr_tip_24 table tr td:first-child,
+li.spr_tip_19.spr_tip_24 table tr td:first-child,
+li.spr_tip_19.jezik_row.tip_24 table tr td:first-child,
+li.spr_tip_20.spr_tip_24 table tr td:first-child,
+li.spr_tip_20.spr_tip_24 table tr td:first-child,
+li.spr_tip_20.jezik_row.tip_24 table tr td:first-child,
+li.spr_tip_24.spr_tip_24 table tr td:first-child,
+li.spr_tip_24.spr_tip_24 table tr td:first-child,
+li.spr_tip_24.jezik_row.tip_24 table tr td:first-child,
+div.spr_tip_6.spr_tip_24 table tr td:first-child,
+div.spr_tip_6.spr_tip_24 table tr td:first-child,
+div.spr_tip_6.jezik_row.tip_24 table tr td:first-child,
+div.spr_tip_16.spr_tip_24 table tr td:first-child,
+div.spr_tip_16.spr_tip_24 table tr td:first-child,
+div.spr_tip_16.jezik_row.tip_24 table tr td:first-child,
+div.spr_tip_19.spr_tip_24 table tr td:first-child,
+div.spr_tip_19.spr_tip_24 table tr td:first-child,
+div.spr_tip_19.jezik_row.tip_24 table tr td:first-child,
+div.spr_tip_20.spr_tip_24 table tr td:first-child,
+div.spr_tip_20.spr_tip_24 table tr td:first-child,
+div.spr_tip_20.jezik_row.tip_24 table tr td:first-child,
+div.spr_tip_24.spr_tip_24 table tr td:first-child,
+div.spr_tip_24.spr_tip_24 table tr td:first-child,
+div.spr_tip_24.jezik_row.tip_24 table tr td:first-child,
+div.jezik_row.tip_6.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_6.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_6.jezik_row.tip_24 table tr td:first-child,
+div.jezik_row.tip_16.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_16.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_16.jezik_row.tip_24 table tr td:first-child,
+div.jezik_row.tip_19.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_19.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_19.jezik_row.tip_24 table tr td:first-child,
+div.jezik_row.tip_20.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_20.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_20.jezik_row.tip_24 table tr td:first-child,
+div.jezik_row.tip_24.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_24.spr_tip_24 table tr td:first-child,
+div.jezik_row.tip_24.jezik_row.tip_24 table tr td:first-child {
+  width: 270px !important;
 }
-.grid_header {
-	font-weight: 500;
-}
-.grid_question {
-	width: 20%;
-	text-align: left;
-	padding-right: 1%;
-}
-.col_border {
-	border-left: 1px solid $gray;
-}
-.grid-plus-minus {
-	text-align: right;
-	visibility: hidden;
-}
-.sub-table {
-	display: none;
-}
-div.grid_inline {
-	min-width: 20px;
-	padding: 2px 0;
-}
-div.grid_inline_droppable_title {
-	height: 15px !important;
-	width: 230px;
-	padding: 2px 0 5 0;
-	margin: 0px auto 0px auto;
-	border-top: 1px black dashed !important;
-	border-left: 1px black dashed !important;
-	border-right: 1px black dashed !important;
-	text-align: center;
-}
-div.grid_inline_droppable_title_box {
-	height: 15px !important;
-	width: 230px;
-	padding: 2px 0 5 0;
-	margin: 0px auto 0px auto;
-	text-align: center;
-}
-li {
-	table.grid_header_table {
-		span.inline.show {
-			visibility: visible;
-		}
-	}
+li.spr_tip_6.spr_tip_24 table tr.variabla td input[type=text], li.spr_tip_6.spr_tip_24 table tr.variabla td input[type=text], li.spr_tip_6.jezik_row.tip_24 table tr.variabla td input[type=text],
+li.spr_tip_16.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_16.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_16.jezik_row.tip_24 table tr.variabla td input[type=text],
+li.spr_tip_19.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_19.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_19.jezik_row.tip_24 table tr.variabla td input[type=text],
+li.spr_tip_20.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_20.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_20.jezik_row.tip_24 table tr.variabla td input[type=text],
+li.spr_tip_24.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_24.spr_tip_24 table tr.variabla td input[type=text],
+li.spr_tip_24.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.spr_tip_6.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_6.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_6.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.spr_tip_16.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_16.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_16.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.spr_tip_19.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_19.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_19.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.spr_tip_20.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_20.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_20.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.spr_tip_24.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_24.spr_tip_24 table tr.variabla td input[type=text],
+div.spr_tip_24.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_6.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_6.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_6.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_16.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_16.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_16.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_19.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_19.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_19.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_20.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_20.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_20.jezik_row.tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_24.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_24.spr_tip_24 table tr.variabla td input[type=text],
+div.jezik_row.tip_24.jezik_row.tip_24 table tr.variabla td input[type=text] {
+  margin: 0;
+  max-width: 100px;
 }
 
 .trak_class {
-	border: 1px solid $gray;
-	cursor: pointer;
-	background: white !important;
+  border: 1px solid #E5E5E5;
+  cursor: pointer;
+  background: white !important;
 }
+
 .trak_class_input {
-	visibility: hidden !important;
-	display: block;
-	z-index: -1;
+  visibility: hidden !important;
+  display: block;
+  z-index: -1;
 }
+
 .radio-button-label {
-	cursor: pointer !important;
-	z-index: -2;
+  cursor: pointer !important;
+  z-index: -2;
 }
+
 .trak_container_bg {
-	background-color: $gray !important;
+  background-color: #E5E5E5 !important;
 }
-table.trak_inline_nadnaslov {
-	td {
-		text-align: center !important;
-	}
-}*/
+
+table.trak_inline_nadnaslov td {
+  text-align: center !important;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -16395,25 +16510,29 @@ and open the template in the editor.
 .slider {
   display: inline-block;
   width: 84.5%;
-  background-color: #E5E5E5 !important;
+  background-color: #F2F2F2 !important;
 }
 .slider .ui-state-default {
   border: 1px solid #E5E5E5 !important;
 }
 .slider .ui-state-hover {
-  border: 1px solid #E5E5E5 !important;
+  border: 1px solid #C4C4C4 !important;
+}
+.slider a {
+  transition: none !important;
 }
 
 .sliderText {
   visibility: hidden;
   position: relative;
-  text-align: center;
-  color: #E5E5E5;
   width: 30px;
   height: 15px;
   padding: 3px;
   margin-top: 7px;
-  background: #E5E5E5;
+  text-align: center;
+  color: #333333;
+  font-size: 14px;
+  background: #F2F2F2;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -16424,7 +16543,7 @@ and open the template in the editor.
   position: absolute;
   border-style: solid;
   border-width: 9px 7px 0;
-  border-color: #E5E5E5 transparent;
+  border-color: #F2F2F2 transparent;
   display: block;
   width: 0;
   z-index: 1;
@@ -16468,7 +16587,7 @@ and open the template in the editor.
   height: 15px !important;
   border-radius: 10px 10px !important;
   margin-left: -8px !important;
-  background: #E5E5E5 !important;
+  background: #F2F2F2 !important;
   top: -23px !important;
   border: 1px solid #E5E5E5 !important;
 }
@@ -16478,7 +16597,7 @@ and open the template in the editor.
   height: 30px !important;
   border-radius: 10px 10px !important;
   margin-left: -7px !important;
-  background: #E5E5E5 !important;
+  background: #F2F2F2 !important;
   top: -31px !important;
   border: 1px solid #E5E5E5 !important;
 }
@@ -16498,6 +16617,10 @@ and open the template in the editor.
   border-right: 1px solid black !important;
 }
 
+.ui-slider-label {
+  font-size: 14px;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/grids.scss b/resources/sass/admin_new/pages/survey_edit/questions/grids.scss
index 978271697..fc1fe3025 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/grids.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/grids.scss
@@ -41,6 +41,14 @@ div.jezik_row.tip_24{
                         span{
                             margin-left: 8px;
                         }
+
+                        /*.faicon{
+                            margin-right: 8px;
+                        }*/
+                    }
+                    .grid-subtable-edit{
+                        display: none;
+                        justify-content: center;
                     }
 
                     .vrednost_inline,
@@ -158,6 +166,10 @@ div.jezik_row.tip_24{
                             box-sizing: border-box;
                             padding: 4px 6px;
                             font-size: 14px;
+
+                            p{
+                                font-size: 14px;
+                            }
                         }
                     }
                 }
@@ -214,106 +226,51 @@ div.jezik_row.tip_24{
     }
 
     &.spr_editing{
-        .grid-plus-minus{
+        .grid-plus-minus,
+        .grid-subtable-edit{
             display: flex !important;
         }
     }
-}
 
 
+    // Kombinirana tabela
+    &.spr_tip_24,
+    &.spr_tip_24,
+    &.jezik_row.tip_24{
+        
+        .variable_holder {
+            overflow-x: auto;
+        }
 
+        table{
 
-/*.spremenljivka_content[tip="24"] {
-	.variable_holder {
-		overflow-x: auto;
-	}
-}
-.grid_header_table {
-	width: 100%;
-	text-align: center;
-	border-collapse: collapse;
-	
-    thead{
-        tr{
-            td{
-                border: 0;
+            tr{
+                
+                td:first-child{
+                    width: 270px !important;
+                }
+      
+                // Vrstica z gumbi za dodajanje / urejanje
+                &.sub-table{
 
-                &.grid_header {
-                    height: 18px;  
+                }
+
+                // Vrstica z vrednostmi
+                &.variabla{
+
+                    td{
+
+                        input[type="text"]{
+                            margin: 0;
+                            max-width: 100px;
+                        }
+                    }
                 }
             }
         }
     }
-    
-	tbody {
-		tr {
-			td {
-				padding-top: 3px;
-				padding-bottom: 3px;
+}
 
-                border: 0;
-			}
-			
-            &:nth-child(odd) {
-				background-color: $light-gray;
-				
-                td {
-					background-color: $light-gray;
-					
-                    div[contenteditable=true] {
-						border: 1px solid transparent;
-					}
-				}
-			}
-		}
-	}
-}
-.grid_header {
-	font-weight: 500;
-}
-.grid_question {
-	width: 20%;
-	text-align: left;
-	padding-right: 1%;
-}
-.col_border {
-	border-left: 1px solid $gray;
-}
-.grid-plus-minus {
-	text-align: right;
-	visibility: hidden;
-}
-.sub-table {
-	display: none;
-}
-div.grid_inline {
-	min-width: 20px;
-	padding: 2px 0;
-}
-div.grid_inline_droppable_title {
-	height: 15px !important;
-	width: 230px;
-	padding: 2px 0 5 0;
-	margin: 0px auto 0px auto;
-	border-top: 1px black dashed !important;
-	border-left: 1px black dashed !important;
-	border-right: 1px black dashed !important;
-	text-align: center;
-}
-div.grid_inline_droppable_title_box {
-	height: 15px !important;
-	width: 230px;
-	padding: 2px 0 5 0;
-	margin: 0px auto 0px auto;
-	text-align: center;
-}
-li {
-	table.grid_header_table {
-		span.inline.show {
-			visibility: visible;
-		}
-	}
-}
 
 .trak_class {
 	border: 1px solid $gray;
@@ -336,4 +293,4 @@ table.trak_inline_nadnaslov {
 	td {
 		text-align: center !important;
 	}
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/slider.scss b/resources/sass/admin_new/pages/survey_edit/questions/slider.scss
index 3d15a9d29..9b0cce15f 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/slider.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/slider.scss
@@ -11,40 +11,52 @@ and open the template in the editor.
 .slider {
 	display: inline-block;
 	width: 84.5%;
-	background-color: $gray !important;
+	background-color: $light-gray2 !important;
+
 	.ui-state-default {
 		border: 1px solid $gray !important;
 	}
 	.ui-state-hover {
-		border: 1px solid $gray !important;
+		border: 1px solid $dark-gray !important;
 	}
+
+    a{
+        transition: none !important;
+    }
 }
+
 .sliderText {
 	visibility: hidden;
 	position: relative;
-	text-align: center;
-	color: $gray;
+	
 	width: 30px;
 	height: 15px;
 	padding: 3px;
 	margin-top: 7px;
-	background: $gray;
+
+    text-align: center;
+	color: $black;
+    font-size: 14px;
+
+	background: $light-gray2;
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 	border: $gray solid 1px;
+
 	&:after {
 		content: '';
 		position: absolute;
 		border-style: solid;
 		border-width: 9px 7px 0;
-		border-color: $gray transparent;
+		border-color: $light-gray2 transparent;
 		display: block;
 		width: 0;
 		z-index: 1;
 		bottom: -9px;
 		left: 11px;
 	}
+
 	&:before {
 		content: '';
 		position: absolute;
@@ -58,6 +70,7 @@ and open the template in the editor.
 		left: 11px;
 	}
 }
+
 .classic_slider {
 	.ui-slider-handle {
 		width: 9px !important;
@@ -86,7 +99,7 @@ and open the template in the editor.
 			height: 15px !important;
 			border-radius: 10px 10px !important;
 			margin-left: -8px !important;
-			background: $gray !important;
+			background: $light-gray2 !important;
 			top: -23px !important;
 			border: 1px solid $gray !important;
 		}
@@ -99,7 +112,7 @@ and open the template in the editor.
 			height: 30px !important;
 			border-radius: 10px 10px !important;
 			margin-left: -7px !important;
-			background: $gray !important;
+			background: $light-gray2 !important;
 			top: -31px !important;
 			border: 1px solid $gray !important;
 		}
@@ -119,3 +132,7 @@ and open the template in the editor.
 	border-left: 1px solid black !important;
 	border-right: 1px solid black !important;
 }
+
+.ui-slider-label{
+    font-size: 14px;
+}