diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 15f490cae..3765c87e4 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -8854,23 +8854,10 @@ class Branching {
         echo '</div>';
 
 
-        echo '<div id="arrows_more_calculation" onclick=" $(\'#calculation_editing_inner\').animate({ scrollTop: $(\'#calculation_editing_inner\').attr(\'scrollHeight\') }, 2000); "><img src="img_0/bullet_arrow_down.png" /> '.$lang['srv_more'].'</div>';
-
         ?><script>
-		$('#calculation_editing_inner').sortable({items: 'form', handle: 'img.move', stop: function () {
+		$('#calculation_editing_inner').sortable({items: 'form', handle: '.move', stop: function () {
 			calculation_sort(<?=$condition?>);
 		} });
-
-		$('#calculation_editing_inner').scroll(function() {
-			if ( isScrolledIntoView('#calculation_editing_operators', '#calculation_editing_inner') )
-				$('#arrows_more_calculation').fadeOut(1000);
-			else
-				$('#arrows_more_calculation').fadeIn(1000);
-		});
-		$('#calculation_editing_inner').resize(function() {
-			$('#calculation_editing_inner').scroll();
-		});
-		$('#calculation_editing_inner').scroll();
 		</script><?
     }
 
@@ -8886,23 +8873,25 @@ class Branching {
 		echo '</div>';
 
         echo '<div class="calculation_editing_body">';
+
         $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
         if (mysqli_num_rows($sql) == 0) {
             sisplet_query("INSERT INTO srv_calculation (id, cnd_id, vrstni_red) VALUES ('', '$condition', '1')");
             $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red");
         }
+
         while ($row = mysqli_fetch_array($sql)) {
             $this->calculation_edit($row['id'], $vrednost);
         }
-        echo '</div>';
 
-
-        echo '<p class="bottom16" id="calculation_editing_operators">'.$lang['srv_add_cond'].':
-                <a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
-                <a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
-                <a href="#" onclick="calculation_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
-                <a href="#" onclick="calculation_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
+        echo '<p class="div_calculation_bottom" id="calculation_editing_operators">'.$lang['srv_add_cond'].':
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
+                <a href="#" onclick="calculation_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
             </p>';
+
+        echo '</div>';        
     }
 
     /**
@@ -8929,53 +8918,13 @@ class Branching {
         $row_count = mysqli_fetch_array($sql_count);
 
 
-		// Headerji tabele - staro
-        if ($row['vrstni_red'] == 1 && $row_count['count'] > 1) {
-			echo '<table class="tbl_condition_editing">';
-			echo '<tr>';
-			echo '<th style="text-align:center; width:50px">'.$lang['srv_oklepaji'].'</th>'; // gumbi oklepaji
-			echo '<th  style="width:70px">&nbsp;</th>'; // logicni operatorji
-			echo '<th style="width:50px">&nbsp;</th>'; // oklepaji
-			echo '<th >&nbsp;</th>';
-			echo '<th style="text-align:center; width:50px;">'.$lang['srv_zaklepaji'].'</th>'; // gumbi zaklepaji
-			echo '<th style="text-align:center; width:60px">'.$lang['edit2'].'</th>'; // move
-			echo '</tr>';
-        	echo '</table>';
-
-			//Samo ena vrstica /spremenljivka/ v kalkulaciji
-        } elseif ($row['vrstni_red'] == 1) {
-			//echo '<table class="tbl_condition_editing"><tr><th>&nbsp;</th></tr></table>';
-        }
-
         // form
-        echo '<form name="calculation_'.$calculation.'" id="calculation_'.$calculation.'" action="" method="post" onsubmit="calculation_edit(\''.$calculation.'\'); return false;">'."\n\r";
+        echo '<form name="calculation_'.$calculation.'" id="calculation_'.$calculation.'" action="" method="post" onsubmit="calculation_edit(\''.$calculation.'\'); return false;">'."\n\r";       
 
-        echo '<table class="tbl_condition_editing" style="margin-bottom:10px; padding-bottom:10px; background-color:white">';
-        echo '<tr>';
-
-
-        // left_bracket
-		if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
-            
-            echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
-            
-            if ($row['left_bracket'] > 0)
-				echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
-			else
-				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
-        } 
-        else {
-            echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-		}
-		echo '</td>';
 
         // operator
-        echo '<td class="tbl_ce_tb white" style="width:77px; text-align:center">';
-
-        if ($row['vrstni_red'] == 1) {
-            // nimamo nic..
-        } else {
+        if ($row['vrstni_red'] > 1) {
+            echo '<div class="condition_editing_row operator">';
 
             if ($row['operator']==0)
 				echo '<a href="#" onclick="calculation_operator_edit(\''.$calculation.'\', \'1\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;+&nbsp;</a>';
@@ -8985,22 +8934,60 @@ class Branching {
 				echo '<a href="#" onclick="calculation_operator_edit(\''.$calculation.'\', \'3\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;*&nbsp;</a>';
 			if ($row['operator']==3)
 				echo '<a href="#" onclick="calculation_operator_edit(\''.$calculation.'\', \'0\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;/&nbsp;</a>';
+                
+            echo '</div>';
         }
 
-        echo '</td>';
 
+        echo '<div class="condition_editing_row">';
+
+        // move
+        echo '<div class="move_holder">';
+        if ($row_count['count'] != 1 )
+        	echo '<span class="faicon move_updown move" title="'.$lang['srv_move'].'" />';
+        echo '</div>';
+
+
+        // Srednji bel del
+        echo '<div class="white_holder">';
 
         // left_bracket
-        echo '<td class="tbl_ce_tb white" style="width:40px; text-align:center">';
+        echo '<div class="column bracket left">';
+
+		if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
+
+            echo '<div class="bracket_icons">';
+
+			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
+			
+            if ($row['left_bracket'] > 0)
+				echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
+			else
+				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
+
+            echo '</div>';    
+
+            echo '<div class="bracket_text">'.$lang['srv_oklepaji'].'</div>';
+        }
+
+		echo '</div>';
+
+        // left_bracket
+        echo '<div class="column display_bracket left">';
+        
         for ($i=$row['left_bracket']; $i>0; $i--) {
-            echo ' ( ';        }
-        echo '</td>';
+            echo ' ( ';        
+        }
+
+        echo '</div>';
 
         // spremenljivka
-        echo '<td class="tbl_ce_tb white" style="width:auto">';
-        if ($row['spr_id']==0) echo '<span class="red">'.$lang['srv_select_spr'].'!</span>';
-        echo '<br />';
-        echo '<select name="calculation_spremenljivka_'.$calculation.'" id="calculation_spremenljivka_'.$calculation.'" size="1" style="width:'.($row['spr_id']==-1?'100':'150').'px" onchange="javascript:calculation_edit(\''.$calculation.'\', \''.$vrednost.'\');">'."\n\r";
+        echo '<div class="column variable">';
+
+        if ($row['spr_id']==0) 
+            echo '<span class="red">'.$lang['srv_select_spr'].'!</span>';
+
+        echo '<select name="calculation_spremenljivka_'.$calculation.'" id="calculation_spremenljivka_'.$calculation.'" size="1" class="dropdown medium" style="width:'.($row['spr_id']==-1?'100':'150').'px" onchange="javascript:calculation_edit(\''.$calculation.'\', \''.$vrednost.'\');">'."\n\r";
 
         echo '<option value="0"></option>';
         echo '<option value="-1"'. ($row['spr_id']==-1 ?' selected="selected"':'').' style="color: blue">&nbsp;&nbsp;&nbsp; '.$lang['srv_number'].'</option>';
@@ -9114,8 +9101,7 @@ class Branching {
 
         // number vnos
         if ($row['spr_id'] == -1) {
-            //if ($row['number'] == 0) $row['number'] = '';
-            echo ' <input type="text" name="number" id="calculation_number_'.$calculation.'" value="'.$row['number'].'" style="width:40px" >';
+            echo ' <input type="text" name="number" id="calculation_number_'.$calculation.'" value="'.$row['number'].'" class="medium" style="width: 40px;">';
 
             echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
 				echo '$(document).ready(function() {' .
@@ -9124,56 +9110,56 @@ class Branching {
 				'  });' .
 				'});';
 			echo '</script>';
-
         }
 
-        echo '<br />&nbsp;'."\n\r";
-        echo '</td>';
-
+        echo '</div>';
 
         // right_bracket
-        echo '<td class="tbl_ce_tb white" style="width:40px; text-align:center">';
+        echo '<div class="column display_bracket right">';
+
         for ($i=$row['right_bracket']; $i>0; $i--) {
             echo ' ) ';
         }
-        echo '</td>';
 
+        echo '</div>';
 
         // right_bracket buttons
+        echo '<div class="column bracket right">';
+
 		if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
-            echo '<td class="tbl_ce_lor" style="width:50px; text-align:center" nowrap>';
+
+            echo '<div class="bracket_icons">';
+
 			if ($row['right_bracket'] > 0)
 				echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'right\', \'minus\'); return false;" title="'.$lang['srv_zaklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
 
 			echo '<a href="#" onclick="javascript:calculation_bracket_edit_new(\''.$calculation.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add"></span></a>';
-		} else {
-            echo '<td class="tbl_ce_lor white" style="width:50px; text-align:center" nowrap>';
-//			echo '<span class="sprites delete_blue_light"></span>';
-//			echo '<span class="sprites add_blue_light"></span>';
-		}
-		echo '</td>';
 
-		// move
-        echo '<td class="tbl_ce_bck_blue white" style="text-align:right; width:30px">';
-        if ($row_count['count'] != 1 )
-        	echo '<img src="img_0/move_updown.png" class="move" title="'.$lang['srv_move'].'" />';
-        echo '</td>';
+            echo '</div>';
+
+            echo '<div class="bracket_text">'.$lang['srv_zaklepaji'].'</div>';
+		} 
+
+		echo '</div>';
+
+        echo '</div>';
+		
 
         // remove
-        echo '<td class="tbl_ce_bck_blue white" style="text-align:left; width:30px">';
+        echo '<div class="delete_holder">';
+
         $sql3 = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id='$row[cnd_id]'");
         if (mysqli_num_rows($sql3) != 1 )
-            echo ' <a href="#" onclick="calculation_remove(\''.$row['cnd_id'].'\', \''.$calculation.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete icon-grey_dark_link delte-if-block"></span></a>'."\n\r";
-        echo '</td>';
+            echo ' <a href="#" onclick="calculation_remove(\''.$row['cnd_id'].'\', \''.$calculation.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete"></span></a>'."\n\r";
+        
+            echo '</div>';
 
 
-        echo '</tr>';
-        echo '</table>';
-
-        echo '</form>'."\n\r";
+        echo '</div>';
 
+        echo '</form>';
     }
 
     /**
diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 8f7d475ab..9bfd260a7 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -2673,6 +2673,30 @@ class BranchingAjax {
 		$b->repare_condition($if);
 		$b->calculation_editing_inner($condition);
 	}
+
+    function ajax_quota_sort() {
+		Common::getInstance()->Init($this->anketa);
+    	Common::getInstance()->updateEditStamp();
+    	
+    	$condition = $_POST['condition'];
+    	$sortable = $_POST['sortable'];
+    	$sortable = explode('&', $sortable);
+    	
+    	$i=1;
+    	foreach ($sortable AS $val) {
+			$quota = explode('=', $val);
+			$quota = $quota[1];
+			
+			$s = sisplet_query("UPDATE srv_quota SET vrstni_red='{$i}' WHERE id='{$quota}'");
+			if (!$s) echo mysqli_error($GLOBALS['connect_db']);
+
+			$i++;
+    	}
+    	
+		$b = new Branching($this->anketa);
+		$b->repare_condition($if);
+		//$b->calculation_editing_inner($condition);
+	}
 	
 	function ajax_spremenljivka_preview_print() {
 		global $lang;
diff --git a/admin/survey/classes/class.SurveyQuotas.php b/admin/survey/classes/class.SurveyQuotas.php
index a2fe7e4a8..faa106b91 100644
--- a/admin/survey/classes/class.SurveyQuotas.php
+++ b/admin/survey/classes/class.SurveyQuotas.php
@@ -154,37 +154,46 @@ class SurveyQuotas {
 
         echo '<div class="popup_close"><a href="#" onClick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">✕</a></div>';
 
-        echo '<div id="quota_editing_inner">';
+        echo '<div id="quota_editing_inner" class="podatki">';
         $this->quota_editing_inner($condition, $vrednost);
         echo '</div>';
 
-        echo '<div id="bottom_space">';
+        echo '<div id="bottom_options">';
 
 		$row = Cache::srv_spremenljivka(-$condition);
-        if ($condition < 0) {		
-			echo '<p style="float:left; padding:0; margin:0; margin-left:20px">'.$lang['srv_variable'].': <input type="text" id="variable_'.(-$condition).'" value="'.$row['variable'].'" onkeyup="quota_edit_variable(\''.-$condition.'\');" style="width:60px" /></p>';
+        if ($condition < 0) {	
+            echo '<div class="setting_horizontal_wrapper">';	
+
+            echo '<div class="setting_holder">';	
+			echo '  <label>'.$lang['srv_variable'].':</label>';
+            echo '  <input type="text" id="variable_'.(-$condition).'" class="large" value="'.$row['variable'].'" onkeyup="quota_edit_variable(\''.-$condition.'\');" />';
+            echo '</div>';
+
+            echo '</div>';
         }
 		
-
-        echo '<div id="condition_editing_close">';
-
-        // kvota kot spremenljivka (lahko jo zbrisemo)
-        if ($condition < 0) {
-	        echo '<span class="buttonwrapper spaceRight floatLeft">';
-	        echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;"><span>'.$lang['srv_anketadelete_txt'].'</span></a>';
-	        echo '</span>';
-		}
-
-		echo '<span class="buttonwrapper spaceRight floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
-        echo '</span>';
-
-        echo '<span class="buttonwrapper floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;"><span>'.$lang['srv_potrdi'].'</span></a>';
-        echo '</span>';
-
         echo '</div>';
+
+
+        echo '<div id="condition_editing_close" class="podatki">';
+		echo '  <div class="button_holder">';
+
+		// kalkulacija kot spremenljivka (lahko jo zbrisemo)
+        if ($condition < 0) 
+			echo '      <button class="medium white-blue" onclick="brisi_spremenljivko(\''.(-$condition).'\'); return false;">'.$lang['srv_anketadelete_txt'].'</button>';				
+
+		echo '      <button class="medium white-blue" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">'.$lang['srv_zapri'].'</button>';				
+		echo '      <button class="medium blue" onclick="quota_editing_close(\''.$condition.'\', \''.$vrednost.'\'); return false;">'.$lang['srv_potrdi'].'</button>';
+		
+        echo '  </div>';
         echo '</div>';
+
+
+        ?><script>
+		$('#quota_editing_inner').sortable({items: 'form', handle: '.move', stop: function () {
+			quota_sort(<?=$condition?>);
+		} });
+		</script><?
     }
 
     private function quota_editing_inner ($condition, $vrednost=0) {
@@ -192,23 +201,16 @@ class SurveyQuotas {
 
         echo '<div class="quota_editing_preview">';
 
-        echo '<h2>'.$lang['srv_quota'].'</h2>';
+        echo '<h2><span class="blue faicon edit"></span>'.$lang['srv_quota'].'</h2>';
         echo '<div id="quota_editing_calculations">';
         echo $this->quota_display($condition, 1);
         echo '</div>';
+
 		echo '</div>';
 
-        echo '<div class="condition_editing_body">';
-        echo '<h2>'.$lang['srv_edit_quota'].'</h2>';
-        echo '</div>';
-		
-		// Vrednost kvote
-		/*$rowS = Cache::srv_spremenljivka(-$condition);
-		echo '<div id="quota_value_holder">';
-		echo $lang['srv_quota_value'].': ';
-		echo ' <input type="text" name="value" id="quota_value" value="'.$rowS['vsota_limit'].'" style="width:50px" onkeypress="checkNumber(this, 6, 0);" onkeyup="checkNumber(this, 9, 0);" onBlur="quota_value_edit(\''.$rowS['id'].'\');">';
-		echo '</div>';*/
-		
+
+        echo '<div class="quota_editing_body">';
+        
         $sql = sisplet_query("SELECT id FROM srv_quota WHERE cnd_id = '$condition' ORDER BY vrstni_red");
         if (mysqli_num_rows($sql) == 0) {
             sisplet_query("INSERT INTO srv_quota (id, cnd_id, vrstni_red) VALUES ('', '$condition', '1')");
@@ -218,12 +220,14 @@ class SurveyQuotas {
 			$this->quota_edit($row['id'], $vrednost);
         }
 
-        echo '<p id="quota_editing_operators" style="margin-left:62px">'.$lang['srv_add_cond'].':
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
-        <a href="#" onclick="quota_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
-        </p>';
+        echo '<p id="quota_editing_operators" class="div_quota_bottom">'.$lang['srv_add_cond'].':
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'0\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;+&nbsp;</strong></a>,
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'1\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;-&nbsp;</strong></a>,
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'2\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;*&nbsp;</strong></a>,
+            <a href="#" onclick="quota_add(\''.$condition.'\', \'3\', \''.$vrednost.'\'); return false;" class="noline"><strong style="font-size:18px">&nbsp;/&nbsp;</strong></a>
+            </p>';
+
+        echo '</div>';
     }
 
     /**
@@ -251,74 +255,76 @@ class SurveyQuotas {
         if (!$sql_count) die();
         $row_count = mysqli_fetch_array($sql_count);
 
-        if ($row['vrstni_red'] == 1 && $row_count['count'] > 1) {
-			echo '<table class="tbl_condition_editing">';
-			echo '<tr>';
-			echo '<th style="text-align:center; width:50px">'.$lang['srv_oklepaji'].'</th>'; // gumbi oklepaji
-			echo '<th  style="width:70px">&nbsp;</th>'; // logicni operatorji
-			echo '<th style="width:50px">&nbsp;</th>'; // oklepaji
-			echo '<th >&nbsp;</th>';
-			echo '<th style="text-align:center; width:50px;">'.$lang['srv_zaklepaji'].'</th>'; // gumbi zaklepaji
-			echo '<th style="text-align:center; width:60px">'.$lang['edit2'].'</th>'; // move
-			echo '</tr>';
-        	echo '</table>';
 
-        } elseif ($row['vrstni_red'] == 1) {
-			echo '<table class="tbl_condition_editing"><tr><th>&nbsp;</th></tr></table>';
+        // operator
+        if ($row['vrstni_red'] > 1) {
+            echo '<div class="condition_editing_row operator">';
+
+            if ($row['operator']==0)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'1\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;+&nbsp;</a>';
+            if ($row['operator']==1)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'2\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;-&nbsp;</a>';
+            if ($row['operator']==2)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'3\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;*&nbsp;</a>';
+            if ($row['operator']==3)
+                echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'0\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;/&nbsp;</a>';
+                
+            echo '</div>';
         }
 
+
         // form
         echo '<form name="quota_'.$quota.'" id="quota_'.$quota.'" action="" method="post" onsubmit="quota_edit(\''.$quota.'\'); return false;">'."\n\r";
 
-        echo '<table class="tbl_condition_editing" style="margin-bottom:10px; padding-bottom:10px; background-color:white">';
-        echo '<tr>';
+        
+        echo '<div class="condition_editing_row">';
 
+        // move
+        echo '<div class="move_holder">';
+        if ($row_count['count'] != 1 )
+            echo '<span class="faicon move_updown move" title="'.$lang['srv_move'].'"></span>';
+        echo '</div>';
+        
+
+        // Srednji bel del
+        echo '<div class="white_holder">';
 
         // left_bracket
+        echo '<div class="column bracket left">';
+
 		if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) {
-            echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add small"></span></a>';
-			if ($row['left_bracket'] > 0)
-				echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon add small"></span></a>';
+
+            echo '<div class="bracket_icons">';
+
+			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'plus\' ); return false;" title="'.$lang['srv_oklepaj_add'].'"><span class="faicon add"></span></a>';
+			
+            if ($row['left_bracket'] > 0)
+				echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'left\', \'minus\'); return false;" title="'.$lang['srv_oklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
+
+            echo '</div>';    
+
+            echo '<div class="bracket_text">'.$lang['srv_oklepaji'].'</div>';
 		} 
-		else {
-            echo '<td class="tbl_ce_lol white" style="width:50px; text-align:center;" >';
-		}
-		echo '</td>';
-
-        // operator
-        echo '<td class="tbl_ce_tb white" style="width:77px; text-align:center">';
-
-        if ($row['vrstni_red'] == 1) {
-            // nimamo nic..
-        } else {
-
-            if ($row['operator']==0)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'1\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;+&nbsp;</a>';
-			if ($row['operator']==1)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'2\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;-&nbsp;</a>';
-			if ($row['operator']==2)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'3\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;*&nbsp;</a>';
-			if ($row['operator']==3)
-				echo '<a href="#" onclick="quota_operator_edit(\''.$quota.'\', \'0\'); return false;" style="font-weight:bold; font-size:18px" title="'.$lang['srv_edit_condition_conjunction'].'">&nbsp;/&nbsp;</a>';
-        }
-
-        echo '</td>';
 
+		echo '</div>';
 
         // left_bracket
-        echo '<td class="tbl_ce_tb white" style="width:40px; text-align:center">';
+        echo '<div class="column display_bracket left">';
+
         for ($i=$row['left_bracket']; $i>0; $i--) {
-            echo ' ( ';        }
-        echo '</td>';
+            echo ' ( ';        
+        }
+
+        echo '</div>';
 
         // spremenljivka
-        echo '<td class="tbl_ce_tb white" style="width:auto">';
+        echo '<div class="column variable">';
+
         if ($row['spr_id']==0) echo '<span class="red">'.$lang['srv_select_spr'].'!</span>';
-        echo '<br />';
-        echo '<select name="quota_spremenljivka_'.$quota.'" id="quota_spremenljivka_'.$quota.'" size="1" style="width:150px" onchange="javascript:quota_edit(\''.$quota.'\', \''.$vrednost.'\');">'."\n\r";
+
+        echo '<select name="quota_spremenljivka_'.$quota.'" id="quota_spremenljivka_'.$quota.'" class="dropdown medium" size="1" style="width:150px" onchange="javascript:quota_edit(\''.$quota.'\', \''.$vrednost.'\');">'."\n\r";
 
         echo '<option value="0"></option>';
 		
@@ -443,61 +449,54 @@ class SurveyQuotas {
 
         echo '</select>';
 
-
-		// Vrednost kvote
-		/*echo ' <input type="text" name="value" id="quota_value_'.$quota.'" value="'.$row['value'].'" style="width:40px" >';
-		echo '<script type="text/javascript">'; // shranimo ko zapustmo input polje
-			echo '$(document).ready(function() {' .
-			'  $("input#quota_value_'.$quota.'").bind("blur", {}, function(e) {' .
-			'    quota_edit(\''.$quota.'\', \''.$vrednost.'\'); return false;  ' .
-			'  });' .
-			'});';
-		echo '</script>';*/
-
-
-        echo '<br />&nbsp;'."\n\r";
-        echo '</td>';
+        echo '</div>';
 
 
         // right_bracket
-        echo '<td class="tbl_ce_tb white" style="width:40px; text-align:center">';
+        echo '<div class="column display_bracket right">';
+
         for ($i=$row['right_bracket']; $i>0; $i--) {
             echo ' ) ';
         }
-        echo '</td>';
+
+        echo '</div>';
 
 
         // right_bracket buttons
+        echo '<div class="column bracket right">';
+
 		if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) {
-            echo '<td class="tbl_ce_lor" style="width:50px; text-align:center" nowrap>';
+
+            echo '<div class="bracket_icons">';
+
 			if ($row['right_bracket'] > 0)
 				echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'right\', \'minus\'); return false;" title="'.$lang['srv_zaklepaj_rem'].'"><span class="faicon delete_circle"></span></a>';
 			else
 				echo '<span class="faicon delete_circle icon-grey_normal"></span>';
 
-			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add small"></span></a>';
-		} 
-		else {
-            echo '<td class="tbl_ce_lor white" style="width:50px; text-align:center" nowrap>';
-		}
-		echo '</td>';
+			echo '<a href="#" onclick="javascript:quota_bracket_edit_new(\''.$quota.'\', \''.$vrednost.'\', \'right\', \'plus\' ); return false;" title="'.$lang['srv_zaklepaj_add'].'"><span class="faicon add"></span></a>';
+
+            echo '</div>';
+
+            echo '<div class="bracket_text">'.$lang['srv_zaklepaji'].'</div>';
+		} 
+
+		echo '</div>';
+
+		echo '</div>';
 
-		// move
-        echo '<td class="tbl_ce_bck_blue white" style="text-align:right; width:30px">';
-        if ($row_count['count'] != 1 )
-        	echo '<img src="img_0/move_updown.png" class="move" title="'.$lang['srv_move'].'" />';
-        echo '</td>';
 
         // remove
-        echo '<td class="tbl_ce_bck_blue white" style="text-align:left; width:30px">';
+        echo '<div class="delete_holder">';
+
         $sql3 = sisplet_query("SELECT id FROM srv_quota WHERE cnd_id='$row[cnd_id]'");
         if (mysqli_num_rows($sql3) != 1 )
             echo ' <a href="#" onclick="quota_remove(\''.$row['cnd_id'].'\', \''.$quota.'\', \''.$vrednost.'\'); return false;" title="'.$lang['srv_if_rem'].'"><span class="faicon delete icon-grey_dark_link delte-if-block"></span></a>'."\n\r";
-        echo '</td>';
+        
+        echo '</div>';
 
 
-        echo '</tr>';
-        echo '</table>';
+        echo '</div>';
 
         echo '</form>'."\n\r";
     }
diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js
index f791e996c..a73a6b6b1 100644
--- a/admin/survey/script/branching.js
+++ b/admin/survey/script/branching.js
@@ -1742,6 +1742,17 @@ function calculation_sort(condition) {
     });
 }
 
+function quota_sort(condition) {
+
+    $('#quota_editing_inner').load('ajax.php?t=branching&a=quota_sort', {
+        'condition': condition,
+        sortable: $('#quota_editing_inner').sortable('serialize'),
+        anketa: srv_meta_anketa_id
+    }, function () {
+        $('#quota_editing_inner').scroll();
+    });
+}
+
 function calculation_edit(calculation, vrednost) {
 
     var spr_id = document
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 17d277407..8ad00fa43 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -17419,14 +17419,6 @@ and open the template in the editor.
   padding: 0;
 }
 
-#calculation_editing_calculations {
-  /*min-height: 40px;*/
-  padding: 0 0 10px 0;
-}
-#calculation_editing_calculations span.calculations_display {
-  font-size: 20px;
-}
-
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -18643,30 +18635,78 @@ and open the template in the editor.
   border-top: 1px solid #1E88E5;
 }
 
-#div_condition_editing_inner .condition_editing_body {
+#div_condition_editing_inner .condition_editing_body,
+#div_condition_editing_inner .quota_editing_body,
+#div_condition_editing_inner .calculation_editing_body,
+#quota_editing_inner .condition_editing_body,
+#quota_editing_inner .quota_editing_body,
+#quota_editing_inner .calculation_editing_body,
+#calculation_editing_inner .condition_editing_body,
+#calculation_editing_inner .quota_editing_body,
+#calculation_editing_inner .calculation_editing_body {
   max-height: 70vh;
   overflow-y: auto;
   margin: 32px 0 0 0;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row,
+#quota_editing_inner .condition_editing_body .condition_editing_row,
+#quota_editing_inner .quota_editing_body .condition_editing_row,
+#quota_editing_inner .calculation_editing_body .condition_editing_row,
+#calculation_editing_inner .condition_editing_body .condition_editing_row,
+#calculation_editing_inner .quota_editing_body .condition_editing_row,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row {
   display: flex;
   align-items: center;
   box-sizing: border-box;
   width: 100%;
   margin-bottom: 8px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row.conjunction,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row.conjunction,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row.conjunction,
+#quota_editing_inner .condition_editing_body .condition_editing_row.conjunction,
+#quota_editing_inner .quota_editing_body .condition_editing_row.conjunction,
+#quota_editing_inner .calculation_editing_body .condition_editing_row.conjunction,
+#calculation_editing_inner .condition_editing_body .condition_editing_row.conjunction,
+#calculation_editing_inner .quota_editing_body .condition_editing_row.conjunction,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row.conjunction {
   padding-left: 22px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .move_holder,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .move_holder,
+#quota_editing_inner .condition_editing_body .condition_editing_row .move_holder,
+#quota_editing_inner .quota_editing_body .condition_editing_row .move_holder,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .move_holder,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .move_holder,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .move_holder,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .move_holder {
   cursor: pointer;
   margin-right: 12px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .move_holder .faicon:before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .move_holder .faicon:before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .move_holder .faicon:before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .move_holder .faicon:before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .move_holder .faicon:before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .move_holder .faicon:before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .move_holder .faicon:before {
   font-size: 20px;
   color: #1E88E5;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder {
   display: flex;
   flex-grow: 1;
   align-items: center;
@@ -18676,42 +18716,138 @@ and open the template in the editor.
   background-color: #FFFFFF;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder span,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder label,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder span,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder label,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder span,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder label,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder span,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder label,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder span,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder label,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder span,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder label,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder span,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder label {
   font-size: 14px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column {
   display: flex;
   align-items: baseline;
   padding: 0 16px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket {
   flex-direction: column;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons {
   display: flex;
   align-items: baseline;
   justify-content: space-evenly;
   width: 100%;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon:before {
   font-size: 14px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_icons .faicon.icon-grey_normal:before {
   line-height: 22px;
   color: #808080;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.bracket .bracket_text {
   font-size: 12px;
   line-height: 15px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.variable,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.variable,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.variable,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.variable,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.variable,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.variable,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.variable {
   flex-direction: column;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator {
   flex-grow: 1;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek {
   display: flex;
   align-items: center;
 }
@@ -18720,7 +18856,55 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a {
   margin-right: 32px;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
@@ -18728,7 +18912,55 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select.operator,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a.operator {
   width: 50px;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
@@ -18736,7 +18968,55 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text] {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a[type=text] {
   width: 100px;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
@@ -18744,7 +19024,55 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a:last-child {
   margin-right: 0;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
@@ -18752,13 +19080,93 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost input .faicon.edit,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost select .faicon.edit,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost a .faicon.edit,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek input .faicon.edit,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek select .faicon.edit,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek a .faicon.edit {
   margin-left: 8px;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value {
   display: flex;
   flex-direction: column;
 }
@@ -18769,7 +19177,71 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span {
   display: flex;
   margin-bottom: 8px;
 }
@@ -18780,42 +19252,218 @@ and open the template in the editor.
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value label:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value span:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value label:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value span:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value label:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value span:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value label:last-child,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value span:last-child {
   margin-bottom: 0;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio::before {
   color: #777777;
 }
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
 #div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .fill_vrednost .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .edit_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .white_holder .column.operator .ostanek .preview_fill_value input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio::before {
   color: #1E88E5;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .delete_holder,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .delete_holder,
+#quota_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
+#quota_editing_inner .quota_editing_body .condition_editing_row .delete_holder,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .delete_holder,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .delete_holder,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .delete_holder,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .delete_holder {
   margin-left: 12px;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row .delete_holder .faicon:before,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row .delete_holder .faicon:before,
+#quota_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
+#quota_editing_inner .quota_editing_body .condition_editing_row .delete_holder .faicon:before,
+#quota_editing_inner .calculation_editing_body .condition_editing_row .delete_holder .faicon:before,
+#calculation_editing_inner .condition_editing_body .condition_editing_row .delete_holder .faicon:before,
+#calculation_editing_inner .quota_editing_body .condition_editing_row .delete_holder .faicon:before,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row .delete_holder .faicon:before {
   font-size: 16px;
   color: #1E88E5;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row select {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row select,
+#div_condition_editing_inner .quota_editing_body .condition_editing_row select,
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row select,
+#quota_editing_inner .condition_editing_body .condition_editing_row select,
+#quota_editing_inner .quota_editing_body .condition_editing_row select,
+#quota_editing_inner .calculation_editing_body .condition_editing_row select,
+#calculation_editing_inner .condition_editing_body .condition_editing_row select,
+#calculation_editing_inner .quota_editing_body .condition_editing_row select,
+#calculation_editing_inner .calculation_editing_body .condition_editing_row select {
   margin: 0;
   width: auto;
 }
-#div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text] {
+#div_condition_editing_inner .condition_editing_body .condition_editing_row input[type=text],
+#div_condition_editing_inner .quota_editing_body .condition_editing_row input[type=text],
+#div_condition_editing_inner .calculation_editing_body .condition_editing_row input[type=text],
+#quota_editing_inner .condition_editing_body .condition_editing_row input[type=text],
+#quota_editing_inner .quota_editing_body .condition_editing_row input[type=text],
+#quota_editing_inner .calculation_editing_body .condition_editing_row input[type=text],
+#calculation_editing_inner .condition_editing_body .condition_editing_row input[type=text],
+#calculation_editing_inner .quota_editing_body .condition_editing_row input[type=text],
+#calculation_editing_inner .calculation_editing_body .condition_editing_row input[type=text] {
   margin: 0;
   width: auto;
 }
-#div_condition_editing_inner .div_condition_bottom {
-  margin: 4px 0 0 22px;
+#div_condition_editing_inner .div_condition_bottom,
+#div_condition_editing_inner .div_quota_bottom,
+#div_condition_editing_inner .div_calculation_bottom,
+#quota_editing_inner .div_condition_bottom,
+#quota_editing_inner .div_quota_bottom,
+#quota_editing_inner .div_calculation_bottom,
+#calculation_editing_inner .div_condition_bottom,
+#calculation_editing_inner .div_quota_bottom,
+#calculation_editing_inner .div_calculation_bottom {
+  margin: 8px 0 0 22px;
   font-size: 14px;
   font-weight: 400;
 }
-#div_condition_editing_inner .div_condition_bottom.loop_bottom {
+#div_condition_editing_inner .div_condition_bottom.loop_bottom,
+#div_condition_editing_inner .div_quota_bottom.loop_bottom,
+#div_condition_editing_inner .div_calculation_bottom.loop_bottom,
+#quota_editing_inner .div_condition_bottom.loop_bottom,
+#quota_editing_inner .div_quota_bottom.loop_bottom,
+#quota_editing_inner .div_calculation_bottom.loop_bottom,
+#calculation_editing_inner .div_condition_bottom.loop_bottom,
+#calculation_editing_inner .div_quota_bottom.loop_bottom,
+#calculation_editing_inner .div_calculation_bottom.loop_bottom {
   margin: 12px 0 0 0;
 }
 
@@ -20380,7 +21028,8 @@ span.faicon.st-besede-popup {
 }
 
 /* Calculation edit */
-#calculation {
+#calculation,
+#quota {
   /*max-height: 90vh;
   overflow-y: scroll;*/
   max-width: 90vw;
@@ -20396,7 +21045,8 @@ span.faicon.st-besede-popup {
   height: auto;
   width: 600px;
 }
-#calculation .popup_close {
+#calculation .popup_close,
+#quota .popup_close {
   position: absolute !important;
   top: 10px;
   right: 10px;
@@ -20404,18 +21054,23 @@ span.faicon.st-besede-popup {
   font-size: 12px !important;
   color: #777777;
 }
-#calculation .popup_close:hover {
+#calculation .popup_close:hover,
+#quota .popup_close:hover {
   color: #333333;
 }
-#calculation .popup_close a {
+#calculation .popup_close a,
+#quota .popup_close a {
   color: #777777;
   text-decoration: none;
 }
-#calculation .popup_close a:hover {
+#calculation .popup_close a:hover,
+#quota .popup_close a:hover {
   color: #333333;
 }
 #calculation h2,
-#calculation .divPopUp_top {
+#calculation .divPopUp_top,
+#quota h2,
+#quota .divPopUp_top {
   width: 100%;
   margin-bottom: 16px;
   padding-bottom: 8px;
@@ -20428,38 +21083,53 @@ span.faicon.st-besede-popup {
 #calculation h2 span.faicon,
 #calculation h2 span.fa-brands,
 #calculation .divPopUp_top span.faicon,
-#calculation .divPopUp_top span.fa-brands {
+#calculation .divPopUp_top span.fa-brands,
+#quota h2 span.faicon,
+#quota h2 span.fa-brands,
+#quota .divPopUp_top span.faicon,
+#quota .divPopUp_top span.fa-brands {
   margin-right: 6px;
   color: #1E88E5;
 }
 #calculation h2 span.faicon:before,
 #calculation h2 span.fa-brands:before,
 #calculation .divPopUp_top span.faicon:before,
-#calculation .divPopUp_top span.fa-brands:before {
+#calculation .divPopUp_top span.fa-brands:before,
+#quota h2 span.faicon:before,
+#quota h2 span.fa-brands:before,
+#quota .divPopUp_top span.faicon:before,
+#quota .divPopUp_top span.fa-brands:before {
   font-size: 14px;
 }
-#calculation p {
+#calculation p,
+#quota p {
   line-height: 20px;
 }
 #calculation .popup_note,
-#calculation .profile_right_note {
+#calculation .profile_right_note,
+#quota .popup_note,
+#quota .profile_right_note {
   margin-bottom: 16px;
   padding: 8px;
   font-size: 16px;
   border: 1px #C4C4C4 solid;
 }
-#calculation .popup_main {
+#calculation .popup_main,
+#quota .popup_main {
   display: flex;
   flex-direction: column;
   border-bottom: 1px #C4C4C4 solid;
 }
-#calculation .popup_main.no_border {
+#calculation .popup_main.no_border,
+#quota .popup_main.no_border {
   border-bottom: none;
 }
-#calculation .popup_main.with_menu {
+#calculation .popup_main.with_menu,
+#quota .popup_main.with_menu {
   flex-direction: row;
 }
-#calculation .popup_main .popup_left {
+#calculation .popup_main .popup_left,
+#quota .popup_main .popup_left {
   box-sizing: border-box;
   width: 216px;
   min-width: 216px;
@@ -20468,11 +21138,13 @@ span.faicon.st-besede-popup {
   margin-right: 16px;
   border-right: 1px #C4C4C4 solid;
 }
-#calculation .popup_main .popup_left .list {
+#calculation .popup_main .popup_left .list,
+#quota .popup_main .popup_left .list {
   display: flex;
   flex-direction: column;
 }
-#calculation .popup_main .popup_left .list .list-item {
+#calculation .popup_main .popup_left .list .list-item,
+#quota .popup_main .popup_left .list .list-item {
   cursor: pointer;
   display: flex;
   justify-content: space-between;
@@ -20484,38 +21156,47 @@ span.faicon.st-besede-popup {
   border-radius: 2px;
   transition: 0.2s;
 }
-#calculation .popup_main .popup_left .list .list-item.active, #calculation .popup_main .popup_left .list .list-item:hover {
+#calculation .popup_main .popup_left .list .list-item.active, #calculation .popup_main .popup_left .list .list-item:hover,
+#quota .popup_main .popup_left .list .list-item.active,
+#quota .popup_main .popup_left .list .list-item:hover {
   background-color: #F8F8F8;
   border-color: #1E88E5;
 }
-#calculation .popup_main .popup_left .list .list-item .profile_icons a {
+#calculation .popup_main .popup_left .list .list-item .profile_icons a,
+#quota .popup_main .popup_left .list .list-item .profile_icons a {
   margin-left: 8px;
 }
-#calculation .popup_main .popup_left button {
+#calculation .popup_main .popup_left button,
+#quota .popup_main .popup_left button {
   display: flex;
   align-items: center;
   width: 100%;
   font-weight: 400;
 }
-#calculation .popup_main .popup_left button .faicon {
+#calculation .popup_main .popup_left button .faicon,
+#quota .popup_main .popup_left button .faicon {
   font-size: 12px;
   line-height: 14px;
 }
-#calculation .popup_main .popup_left button .faicon::before {
+#calculation .popup_main .popup_left button .faicon::before,
+#quota .popup_main .popup_left button .faicon::before {
   margin-right: 8px;
   font-size: 14px;
   color: #1E88E5;
 }
-#calculation .popup_main .popup_right {
+#calculation .popup_main .popup_right,
+#quota .popup_main .popup_right {
   overflow-y: auto;
   max-height: 70vh;
   width: 100%;
 }
-#calculation .popup_main .popup_right .popup_right_note {
+#calculation .popup_main .popup_right .popup_right_note,
+#quota .popup_main .popup_right .popup_right_note {
   margin-bottom: 16px;
   font-size: 16px;
 }
-#calculation .popup_main fieldset {
+#calculation .popup_main fieldset,
+#quota .popup_main fieldset {
   display: flex;
   flex-direction: column;
   padding: 16px 0 0 0;
@@ -20523,48 +21204,63 @@ span.faicon.st-besede-popup {
   border: 0;
   border-top: 1px #E5E5E5 solid;
 }
-#calculation .popup_main fieldset legend {
+#calculation .popup_main fieldset legend,
+#quota .popup_main fieldset legend {
   padding: 0 8px 0 0;
   font-size: 14px;
 }
-#calculation .popup_main span {
+#calculation .popup_main span,
+#quota .popup_main span {
   font-size: 14px;
 }
-#calculation .popup_main .setting_line {
+#calculation .popup_main .setting_line,
+#quota .popup_main .setting_line {
   margin-bottom: 8px;
   font-size: 14px;
 }
-#calculation .popup_main .setting_line:last-of-type {
+#calculation .popup_main .setting_line:last-of-type,
+#quota .popup_main .setting_line:last-of-type {
   margin-bottom: 0;
 }
 #calculation .popup_main .setting_line label,
-#calculation .popup_main .setting_line span {
+#calculation .popup_main .setting_line span,
+#quota .popup_main .setting_line label,
+#quota .popup_main .setting_line span {
   font-size: 14px;
 }
-#calculation .popup_main .settings_block {
+#calculation .popup_main .settings_block,
+#quota .popup_main .settings_block {
   display: flex;
   flex-direction: column;
   margin-bottom: 16px;
 }
 #calculation .popup_main .settings_block label,
-#calculation .popup_main .settings_block span {
+#calculation .popup_main .settings_block span,
+#quota .popup_main .settings_block label,
+#quota .popup_main .settings_block span {
   font-size: 14px;
 }
-#calculation .button_holder {
+#calculation .button_holder,
+#quota .button_holder {
   justify-content: end !important;
   margin: 20px 0 0 0;
 }
-#calculation .button_holder button:last-child {
+#calculation .button_holder button:last-child,
+#quota .button_holder button:last-child {
   margin-right: 0;
 }
-#calculation.warning_popup h2::before {
+#calculation.warning_popup h2::before,
+#quota.warning_popup h2::before {
   padding-right: 8px;
   font-family: "Font Awesome 5 Free";
   content: "";
   font-size: 14px;
   color: #FFC700;
 }
-#calculation #calculation_editing_inner {
+#calculation #calculation_editing_inner,
+#calculation #quota_editing_inner,
+#quota #calculation_editing_inner,
+#quota #quota_editing_inner {
   top: 0;
   bottom: 0;
   left: 0;
@@ -20572,28 +21268,91 @@ span.faicon.st-besede-popup {
   margin-bottom: 40px;
   overflow: auto;
 }
-#calculation #calculation_editing_inner.podatki {
+#calculation #calculation_editing_inner.podatki,
+#calculation #quota_editing_inner.podatki,
+#quota #calculation_editing_inner.podatki,
+#quota #quota_editing_inner.podatki {
   margin-bottom: 0;
 }
-#calculation .calculation_editing_body {
+#calculation #calculation_editing_inner .calculation_editing_body,
+#calculation #calculation_editing_inner .quota_editing_body,
+#calculation #quota_editing_inner .calculation_editing_body,
+#calculation #quota_editing_inner .quota_editing_body,
+#quota #calculation_editing_inner .calculation_editing_body,
+#quota #calculation_editing_inner .quota_editing_body,
+#quota #quota_editing_inner .calculation_editing_body,
+#quota #quota_editing_inner .quota_editing_body {
   max-height: 40vh;
   overflow-y: auto;
-  margin: 20px 0;
-  padding: 10px 5px 5px 5px;
-  border: 1px #1E88E5 solid;
+  margin: 16px 0 16px 0;
+  padding: 12px;
+  background-color: #EEF7FF;
+  border: 1px #cce4f9 solid;
 }
-#calculation .calculation_editing_body .tbl_condition_editing {
-  margin-bottom: 5px;
+#calculation #calculation_editing_inner .calculation_editing_body .condition_editing_row,
+#calculation #calculation_editing_inner .quota_editing_body .condition_editing_row,
+#calculation #quota_editing_inner .calculation_editing_body .condition_editing_row,
+#calculation #quota_editing_inner .quota_editing_body .condition_editing_row,
+#quota #calculation_editing_inner .calculation_editing_body .condition_editing_row,
+#quota #calculation_editing_inner .quota_editing_body .condition_editing_row,
+#quota #quota_editing_inner .calculation_editing_body .condition_editing_row,
+#quota #quota_editing_inner .quota_editing_body .condition_editing_row {
+  margin-bottom: 0;
 }
-#calculation #condition_editing_close {
+#calculation #calculation_editing_inner .calculation_editing_body .condition_editing_row.operator,
+#calculation #calculation_editing_inner .quota_editing_body .condition_editing_row.operator,
+#calculation #quota_editing_inner .calculation_editing_body .condition_editing_row.operator,
+#calculation #quota_editing_inner .quota_editing_body .condition_editing_row.operator,
+#quota #calculation_editing_inner .calculation_editing_body .condition_editing_row.operator,
+#quota #calculation_editing_inner .quota_editing_body .condition_editing_row.operator,
+#quota #quota_editing_inner .calculation_editing_body .condition_editing_row.operator,
+#quota #quota_editing_inner .quota_editing_body .condition_editing_row.operator {
+  padding-left: 22px;
+  margin: 8px 0;
+}
+#calculation #calculation_editing_inner .calculation_editing_body .condition_editing_row.operator a,
+#calculation #calculation_editing_inner .quota_editing_body .condition_editing_row.operator a,
+#calculation #quota_editing_inner .calculation_editing_body .condition_editing_row.operator a,
+#calculation #quota_editing_inner .quota_editing_body .condition_editing_row.operator a,
+#quota #calculation_editing_inner .calculation_editing_body .condition_editing_row.operator a,
+#quota #calculation_editing_inner .quota_editing_body .condition_editing_row.operator a,
+#quota #quota_editing_inner .calculation_editing_body .condition_editing_row.operator a,
+#quota #quota_editing_inner .quota_editing_body .condition_editing_row.operator a {
+  font-size: 20px;
+  text-decoration: none;
+}
+#calculation #calculation_editing_inner .calculation_editing_body .condition_editing_row .variable,
+#calculation #calculation_editing_inner .quota_editing_body .condition_editing_row .variable,
+#calculation #quota_editing_inner .calculation_editing_body .condition_editing_row .variable,
+#calculation #quota_editing_inner .quota_editing_body .condition_editing_row .variable,
+#quota #calculation_editing_inner .calculation_editing_body .condition_editing_row .variable,
+#quota #calculation_editing_inner .quota_editing_body .condition_editing_row .variable,
+#quota #quota_editing_inner .calculation_editing_body .condition_editing_row .variable,
+#quota #quota_editing_inner .quota_editing_body .condition_editing_row .variable {
+  flex-direction: row;
+}
+#calculation #calculation_editing_inner .calculation_editing_body .condition_editing_row .variable input[type=text],
+#calculation #calculation_editing_inner .quota_editing_body .condition_editing_row .variable input[type=text],
+#calculation #quota_editing_inner .calculation_editing_body .condition_editing_row .variable input[type=text],
+#calculation #quota_editing_inner .quota_editing_body .condition_editing_row .variable input[type=text],
+#quota #calculation_editing_inner .calculation_editing_body .condition_editing_row .variable input[type=text],
+#quota #calculation_editing_inner .quota_editing_body .condition_editing_row .variable input[type=text],
+#quota #quota_editing_inner .calculation_editing_body .condition_editing_row .variable input[type=text],
+#quota #quota_editing_inner .quota_editing_body .condition_editing_row .variable input[type=text] {
+  margin-left: 8px;
+}
+#calculation #condition_editing_close,
+#quota #condition_editing_close {
   float: right;
   margin: 20px 20px 20px 0;
 }
-#calculation #condition_editing_close.podatki {
+#calculation #condition_editing_close.podatki,
+#quota #condition_editing_close.podatki {
   margin: 0;
   display: block;
 }
-#calculation #bottom_space {
+#calculation #bottom_space,
+#quota #bottom_space {
   bottom: 0;
   left: 0;
   position: absolute;
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index 2191bd20b..dee5d56c8 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -521,14 +521,18 @@ and open the template in the editor.
 
 }
 
-//IF - vsebina pogoja
-#div_condition_editing_inner {
+//IF - vsebina pogoja, kalkulacije, kvote
+#div_condition_editing_inner,
+#quota_editing_inner,
+#calculation_editing_inner{
 
     .condition_editing_preview {
 
     }
 
-    .condition_editing_body{
+    .condition_editing_body,
+    .quota_editing_body,
+    .calculation_editing_body{
         max-height: 70vh;
         overflow-y: auto;
 
@@ -691,8 +695,10 @@ and open the template in the editor.
         }
     }
 
-    .div_condition_bottom {
-        margin: 4px 0 0 22px;
+    .div_condition_bottom,
+    .div_quota_bottom,
+    .div_calculation_bottom {
+        margin: 8px 0 0 22px;
 
         font-size: 14px;
         font-weight: 400;
diff --git a/resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss b/resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss
index a48f20310..ab8742963 100644
--- a/resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss
+++ b/resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss
@@ -29,7 +29,8 @@
 
 
 /* Calculation edit */
-#calculation {
+#calculation,
+#quota {
     @include popup_general();
     
 	display: none;
@@ -42,7 +43,8 @@
 	height: auto;
 	width: 600px;
     
-    #calculation_editing_inner {
+    #calculation_editing_inner,
+    #quota_editing_inner {
 		top: 0;
 		bottom: 0;
 		left: 0;
@@ -53,19 +55,39 @@
 		&.podatki {
 			margin-bottom: 0;
 		}
-	}
 
-    .calculation_editing_body{
-		max-height: 40vh;
-        overflow-y: auto;
+        .calculation_editing_body,
+        .quota_editing_body{
+            max-height: 40vh;
+            overflow-y: auto;
+    
+            margin: 16px 0 16px 0;
+            padding: 12px;
+    
+            background-color: $medium-blue;
+            border: 1px #cce4f9 solid;
+    
+            .condition_editing_row{
+                margin-bottom: 0;
 
-        margin: 20px 0;
-        padding: 10px 5px 5px 5px;
+                &.operator{
+                    padding-left: 22px;
+                    margin: 8px 0;
 
-        border: 1px $blue solid;
+                    a{
+                        font-size: 20px;
+                        text-decoration: none;
+                    }
+                }
 
-        .tbl_condition_editing{
-            margin-bottom: 5px;
+                .variable{
+                    flex-direction: row;
+                    
+                    input[type="text"]{
+                        margin-left: 8px;
+                    }
+                }
+            }
         }
 	}
 
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/calculation.scss b/resources/sass/admin_new/pages/survey_edit/questions/calculation.scss
index 8174f7039..06a828ecb 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/calculation.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/calculation.scss
@@ -25,14 +25,4 @@ and open the template in the editor.
 }
 #bottom_space {
 	padding: 0;
-}
-
-
-#calculation_editing_calculations {
-	/*min-height: 40px;*/
-	padding: 0 0 10px 0;
-    
-    span.calculations_display {
-		font-size: 20px;
-	}
 }
\ No newline at end of file