diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 92236b942..6d43db47d 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -42,49 +42,71 @@ class Vprasanje {
 	* 
 	*/
 	function display () {
-				
+		global $lang;
+
+        echo '<div class="vprasanje_edit_holder">';
+
+        echo '<div id="vprasanje_header">';
+		echo $lang['settings'];
+        echo '</div>';
+
+        echo '<div id="vprasanje_tabs">';
 		$this->tabs();
+        echo '</div>';
 		
 		echo '<div id="vprasanje_edit">';
 		$this->vprasanje_edit();
 		echo '</div>';
 		
-		$this->edit_buttons();		
+        echo '<div class="button_holder">';
+		$this->edit_buttons();	
+        echo '</div>';	
+
+        echo '</div>';	
 	}
 	
+
 	/**
 	* izrise tabe pri urejanju vprasanja
 	* 
 	*/
-	function tabs () {
+	private function tabs () {
 		global $lang;
 		global $admin_type;
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 		$rows = SurveyInfo::getInstance()->getSurveyRow();
 		
-		echo '<div id="vprasanje_tabs">';
-		
-		echo '<a href="#" class="tab_link active" id="tab_link_0" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'0\'); return false;">'.$lang['srv_osnovno'].'</a>';
-				
+        echo '<div class="tab_link active" id="tab_link_0" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'0\'); return false;">';
+		echo '  <span>'.$lang['srv_osnovno'].'</span>';
+        echo '</div>';
+
 		if ($this->spremenljivka > 0 && !Demografija::getInstance()->isDemografija($row['variable']) ) {
 			
 			// Tab napredno
-			echo '<a href="#" class="tab_link" id="tab_link_1" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'1\'); return false;">'.$lang['srv_napredno'].'</a>';
+            echo '<div class="tab_link" id="tab_link_1" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'1\'); return false;">';
+			echo '  <span>'.$lang['srv_napredno'].'</span>';
+            echo '</div>';
 			
 			// Tab pogoji
-			echo '<a href="#" class="tab_link" id="tab_link_2" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'2\'); return false;">'.$lang['srv_condition'].'</a>';
-			
+            echo '<div class="tab_link" id="tab_link_2" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'2\'); return false;">';
+			echo '  <span>'.$lang['srv_condition'].'</span>';
+			echo '</div>';
+
 			// Tab validacija
-			echo '<a href="#" class="tab_link" id="tab_link_7" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'7\'); return false;">'.$lang['srv_validation'].'</a>';
-		
+            echo '<div class="tab_link" id="tab_link_7" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'7\'); return false;">';
+            echo '  <span>'.$lang['srv_validation'].'</span>';
+            echo '</div>';
+
 			// Tab opomba
-			echo '<a href="#" class="tab_link" id="tab_link_3" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'3\'); return false;">'.$lang['srv_note'].($row['note']!=''?'*':'').'</a>';
-					
+            echo '<div class="tab_link" id="tab_link_3" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'3\'); return false;">';
+            echo '  <span>'.$lang['srv_note'].($row['note']!=''?'*':'').'</span>';
+			echo '</div>';
+
 			// Tab tracking sprememb na vprašanju
 			if (($admin_type == 0 || $admin_type == 1) && $rows['vprasanje_tracking'] > 0){
-				echo '<div class="tab_link_tracking">';
-				echo '<a href="#" class="tab_link" id="tab_link_6" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'6\'); return false;" title="'.$lang['hour_archive'].'"><span>'.$lang['hour_archive'].'</span></a>';
+				echo '<div class="tab_link tracking" id="tab_link_6" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'6\'); return false;" title="'.$lang['hour_archive'].'">';
+				echo '  <span><span>'.$lang['hour_archive'].'</span>';
 				echo '</div>';
 			}
 		} 
@@ -92,15 +114,18 @@ class Vprasanje {
 			
 			$star = '';
 			if ($this->spremenljivka == -1) {
-				if ($rows['thread_intro']!=0 || $rows['intro_note']!='') $star = '*';
-			} else {
-				if ($rows['thread_concl']!=0 || $rows['concl_note']!='') $star = '*';
+				if ($rows['thread_intro']!=0 || $rows['intro_note']!='') 
+                    $star = '*';
+			} 
+            else {
+				if ($rows['thread_concl']!=0 || $rows['concl_note']!='')
+                    $star = '*';
 			}
-			
-			echo '<a href="#" class="tab_link" id="tab_link_3" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'3\'); return false;">'.$lang['srv_note'].$star.'</a>';			
-		}			
-		
-		echo '</div>';
+            
+            echo '<div class="tab_link" id="tab_link_3" onclick="vprasanje_tab(\''.$this->spremenljivka.'\', \'3\'); return false;">';
+			echo '  <span>'.$lang['srv_note'].$star.'</span>';	
+            echo '</div>';		
+		}
 	}
 	
 	/** 
@@ -144,8 +169,6 @@ class Vprasanje {
 		echo '</div>';
 			
 		echo '</form>';
-		
-		echo '<span id="vprasanje_edit_bottom_placeholder"></span>';
 	}
 	
 	/** 
@@ -201,12 +224,13 @@ class Vprasanje {
 				
 				// reminder
 				$this->edit_reminder();
-			
-			
             } 
             // navadno vprasanje
             else {
 				
+                // POGOSTE NASTAVITVE
+                echo '<fieldset><legend>'.$lang['srv_common_settings'].'</legend>';
+
 				// variabla na vrhu
 				$this->variable(1);
 				
@@ -223,6 +247,9 @@ class Vprasanje {
                         $this->edit_orientation();
                     }
 				}
+
+                echo '</fieldset>';
+
 				
 				// datum-min/max date
 				if ( in_array($row['tip'], array(8)) ) {
@@ -883,27 +910,31 @@ class Vprasanje {
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 		$spremenljivkaParams = new enkaParameters($row['params']);
 		
-		if($row['signature'] != 1){	//ce ni elektronski podpis
+        // ce ni elektronski podpis
+		if($row['signature'] != 1){	
 			$displayOrientation = 'display: block';
-		}else{
+		}
+        else{
 			$displayOrientation = 'display: none';
 		}
-			//echo '<p>';
-			echo '<p id="orientation_'.$this->spremenljivka.'" style="'.$displayOrientation.' ">';
-			echo '<span class="title" >'.$lang['srv_orientacija'].': </span>';
-			
-			//echo (int)$row['orientation'];
-			echo '<span class="content"><select name="orientation" id="spremenljivka_orientation_' . $row['id'] . '" spr_id="'.$row['id'].'">';
-			
-			echo '<option value="1"' . (($row['orientation'] == 1 || $row['orientation'] == 2) ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna_2'].'</option>';
-			//echo '<option value="1"' . ($row['orientation'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
-			echo '<option value="0"' . ($row['orientation'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna'].'</option>';
-			if($row['tip'] == 21)
-				echo '<option value="3"' . (($row['orientation'] == 3 || $row['orientation'] == 3) ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
-			
-			echo '</select></span>';
-			
-			echo '</p>';
+
+        echo '<div id="orientation_'.$this->spremenljivka.'" class="vprasanje_setting_holder" style="'.$displayOrientation.' ">';
+        
+        echo '<div class="vprasanje_setting_line">';
+        echo '<span class="title" >'.$lang['srv_orientacija'].': </span>';
+
+        echo '<span class="content"><select name="orientation" id="spremenljivka_orientation_' . $row['id'] . '" spr_id="'.$row['id'].'">';
+        
+        echo '<option value="1"' . (($row['orientation'] == 1 || $row['orientation'] == 2) ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna_2'].'</option>';
+        echo '<option value="0"' . ($row['orientation'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna'].'</option>';
+        if($row['tip'] == 21)
+            echo '<option value="3"' . (($row['orientation'] == 3 || $row['orientation'] == 3) ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
+        
+        echo '</select></span>';
+        
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	
@@ -1015,12 +1046,16 @@ class Vprasanje {
         $naslov = $newParams->get('naslov_podvprasanja_map'); //dobi naslov podvprasanja mape
         $marpod = $newParams->get('marker_podvprasanje'); //ali dodam podvprasanje v infowindow
 
-        echo '<p id="naslov_podvprasanja_map" '.(($marpod == 1 || $row['enota'] == 3) ? '' : 'style="display: none;"').'>';
-        echo '<span class="title" >'.$lang['srv_vprasanje_naslov_podvprasanja_map'].': '.Help::display('naslov_podvprasanja_map').'</span>';
-        echo '<span class="content">';
-        echo '<input type="text" value="'.$naslov.'"  name="naslov_podvprasanja_map" id="naslov_podvprasanja_map_' . $row['id'] . '" spr_id="'.$row['id'].'" size="25" />';
-        echo '</span>';
-        echo '</p>';
+        echo '<div id="naslov_podvprasanja_map" class="vprasanje_setting_holder" '.(($marpod == 1 || $row['enota'] == 3) ? '' : 'style="display: none;"').'>';
+        
+        echo '<div class="vprasanje_setting_line">'; 
+        echo '  <span class="title">'.$lang['srv_vprasanje_naslov_podvprasanja_map'].': '.Help::display('naslov_podvprasanja_map').'</span>';
+        echo '  <span class="content">';
+        echo '      <input type="text" value="'.$naslov.'"  name="naslov_podvprasanja_map" id="naslov_podvprasanja_map_' . $row['id'] . '" spr_id="'.$row['id'].'" size="25" />';
+        echo '  </span>';
+        echo '</div>';
+
+        echo '</div>';
 	}
 	
 	/**
@@ -1096,7 +1131,7 @@ class Vprasanje {
 
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		//echo '<h2>'.$row['variable'].' - '.$lang['srv_napredno_urejanje'].'</h2>';
+
 		$this->variable();
 	
 	
@@ -1232,9 +1267,7 @@ class Vprasanje {
 			}
 			
 		} else {
-			
-			//echo '<h2>'.$rows['variable'].' - '.$lang['srv_edit_condition_question'].'</h2>';
-				
+							
 			echo '<p id="if_preview">';
 			
 			$b->conditions_display($row['parent']);
@@ -1346,15 +1379,11 @@ class Vprasanje {
 				$rows['variable'] = $lang['srv_intro_label'];
 				$rows['note'] = $row['intro_note'];
 				$rows['thread'] = $row['thread_intro'];
-				
-				echo '<h2>'.$rows['variable'].'</h2>';
 			} 
 			elseif ($this->spremenljivka == -2) {
 				$rows['variable'] = $lang['srv_end_label'];
 				$rows['note'] = $row['concl_note'];
 				$rows['thread'] = $row['thread_concl'];
-				
-				echo '<h2>'.$rows['variable'].'</h2>';
 			}
 		}
 		
@@ -1498,134 +1527,6 @@ class Vprasanje {
 		echo '</span>';
 	}
 	
-	
-	
-	/** 
-	* urejanje label za grafe
-	* 
-	*/
-	/*function vprasanje_grafi () {
-		global $lang;
-		
-		$row = Cache::srv_spremenljivka($this->spremenljivka);
-			
-		//echo '<h2>'.$row['variable'].' - '.$lang['srv_grafi_urejanje'].'</h2>';
-		$this->variable();
-		
-		// Enable/disable editiranje label posebej za grafe
-		$this->edit_graf();		
-		
-		// Gumb za kopiranje besedila iz osnovnega urejanja
-		echo '<div class="chart_copy" '.($row['edit_graf'] == 0 ? ' style="display: none;"' : '').'><p>';
-		echo $lang['srv_edit_chart_copy'].': ';
-		echo '<input type="button" name="copy_graf" value="'.$lang['srv_edit_chart_copyB'].'" onClick="copy_chart();" />';
-		
-		//echo '<a class="ovalbutton ovalbutton_gray" onclick="copy_chart();" href="#">
-		//	<span>'.$lang['srv_edit_chart_copyB'].'</span>
-		//	</a>';
-		
-		echo '</p></div>';
-		
-		$show = ($row['edit_graf'] == 0) ? ' style="display:none;"' : '';
-		
-		echo '<div class="chart_editing" '.$show.'>';
-		
-		// Urejanje naslova spremenljivke
-		$text = $row['naslov_graf'] == '<p></p>' ? $row['naslov'] : $row['naslov_graf'];
-		if (strtolower(substr($text, 0, 3)) == '<p>' && strtolower(substr($text, -4)) == '</p>' && strrpos($text, '<p>') == 0) {
-			$text = substr($text, 3);
-			$text = substr($text, 0, -4);
-		}		
-		echo '<p>';
-		echo '<textarea style="width:99%; height:60px;" name="naslov_graf" id="naslov_graf" class="chart_label">'.$text.'</textarea>';
-		echo '</p>';		
-				
-		// Urejanje naslovov variabel
-		$sql1 = sisplet_query("SELECT id, naslov, naslov_graf, variable, other FROM srv_vrednost WHERE spr_id = '$this->spremenljivka' ORDER BY vrstni_red ASC");
-		if (!$sql1) echo mysqli_error($GLOBALS['connect_db']);
-		
-		echo '<input type="hidden" name="edit_vrednost_graf" value="1" />';
-		
-		echo '<div id="vrednosti_holder"><ul class="vrednost_sort">';
-		while ($row1 = mysqli_fetch_array($sql1)) {
-			
-			$text = $row1['naslov_graf'] == '' ? $row1['naslov'] : $row1['naslov_graf'];
-			
-			echo '<li id="vrednost_'.$vrednost.'" '.($row1['other'] == 1 ? 'class="li_other"' : '').'>';
-	
-			$gridWidth = 42;
-					
-			echo '<textarea name="vrednost_graf_'.$row1['id'].'" id="'.$row1['variable'].'_graf" class="vrednost_textarea chart_label" style="width:'.$gridWidth.'%;">'.$text.'</textarea> ';
-			echo '['.$row1['variable'].']</span>';
-			if ($row1['other'] == 1) echo ' <input type="text" disabled style="width:40px" />';
-
-			echo '</li>';			
-		}
-		
-		echo '</ul>';
-	
-		echo '</div>';
-				
-		
-		// Urejanje label za gride
-		//if($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20){
-		if($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20 || $row['tip'] == 2){
-			
-			echo '<div class="grid_settings">';
-			echo '<input type="hidden" name="edit_grid_graf" value="1" />';
-
-			echo '<table id="grids" style="width:100%">';
-			
-			echo '<tr>';
-			for ($i=1; $i<=$row['grids']; $i++) {
-				echo '<td>'.$i.'</td>';
-			}
-			
-			//dodatne vrednosti (ne vem, zavrnil...)
-			if (count($already_set_mv) > 0 ) {
-				echo '<td></td>';
-				if (count($missing_values) > 0) {
-					foreach ($missing_values AS $mv_key => $mv_text) {
-						if (isset($already_set_mv[$mv_key])) {
-							echo '<td>'.$mv_key.'</td>';
-						}
-					}
-				}
-			}
-			echo '</tr>';
-			
-			echo '<tr>';
-			for ($i=1; $i<=$row['grids']; $i++) {
-				$sql1 = sisplet_query("SELECT naslov, naslov_graf FROM srv_grid WHERE id='$i' AND spr_id='$this->spremenljivka'");
-				$row1 = mysqli_fetch_array($sql1);
-				$text = $row1['naslov_graf'] == '' ? $row1['naslov'] : $row1['naslov_graf'];
-				echo '<td><input type="text" name="grid_graf_'.$i.'" id="grid_naslov_'.$i.'_graf" class="chart_label" value="'.$text.'" /></td>';
-			}
-			
-			//dodatne vrednosti (ne vem, zavrnil...)
-			if (count($already_set_mv) > 0 ) {
-				echo '<td></td>';
-				if (count($missing_values) > 0) {
-					foreach ($missing_values AS $mv_key => $mv_text) {
-						if (isset($already_set_mv[$mv_key])) {
-							echo '<td><input type="text" name="grid_'.$mv_key.'_graf" class="chart_label" value="'.$already_set_mv[$mv_key].'" /></td>';
-						}
-					}
-				}
-			}
-			echo '</tr>';
-			
-			echo '</table>';
-			echo '</div>';
-		}
-		
-		echo '</div>';
-		
-		
-		// sirina labele grafa (navadna ali 50%)
-		//$this->wide_graf();	
-	}*/
-	
 	/** 
 	* prikaz trackinga sprememb spremenljivke
 	* 
@@ -1694,7 +1595,13 @@ class Vprasanje {
         } 
         // obicna roleta za tip
         else {
-					
+				
+            echo '<div class="vprasanje_setting_holder">';
+            
+            echo '<div class="vprasanje_setting_line half-half">';
+
+            echo '<label>'.$lang['srv_question_type'].':</label>';
+
 			echo '<span class="content"><select name="tip" id="spremenljivka_tip_' . $row['id'] . '" size="1" spr_id="' . $row['id'] . '" onChange="change_tip(\'' . $row['id'] . '\', $(this).val());">';
 			echo '<option value="1"' . ($row['tip'] == 1 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_radio'] . '</option>';
 			echo '<option value="2"' . ($row['tip'] == 2 ? ' selected="true"' : '') . '>' . $lang['srv_vprasanje_checkbox'] . '</option>';
@@ -1751,9 +1658,11 @@ class Vprasanje {
 			}
 		
 			echo '</select></span>';
-			//echo '</p>';
-		
-		
+
+            echo '</div>';
+
+            echo '</div>';
+
 			echo '<script type="text/javascript">';
 			echo '$(document).ready(function() { ';
 			echo '$("#spremenljivka_tip_' . $row['id'] . '").selectbox();'; // kreira custom dropdown z možnostjo predogleda vprašanja
@@ -1886,11 +1795,8 @@ class Vprasanje {
 	*/
 	function variable ($edit_tip = 0) {
 		
-		$row = Cache::srv_spremenljivka($this->spremenljivka);
-		
-		echo '<h2>'.$row['variable'].'';
-		if ($edit_tip == 1) $this->edit_tip();
-		echo '</h2>';	
+		if ($edit_tip == 1) 
+            $this->edit_tip();
 	}
 	
 	//edit opombe
@@ -1917,8 +1823,6 @@ class Vprasanje {
 		global $admin_type;
 		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
-
-		echo '<h2>'.$lang['srv_intro_label'].'</h2>';
 		
 		if ($row['introduction'] == '') {
 			$lang_admin = SurveyInfo::getInstance()->getSurveyColumn('lang_admin');
@@ -1988,8 +1892,6 @@ class Vprasanje {
 		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
 		SurveySetting::getInstance()->Init($this->anketa);
-
-		echo '<h2>'.$lang['srv_end_label'].'</h2>';
 		
 		if ($row['conclusion'] == '') {
 			$lang_admin = SurveyInfo::getInstance()->getSurveyColumn('lang_admin');
@@ -2128,8 +2030,6 @@ class Vprasanje {
 		global $lang;
 		
 		$row = SurveyInfo::getInstance()->getSurveyRow();
-
-		echo '<h2>'.$lang['srv_statistic_label'].'</h2>';
 		
 		$text = $row['statistics'];
 		
@@ -3354,8 +3254,11 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		echo '<p>';
-		echo '<span class="title" >'.$lang['srv_orientacija'].': </span>';
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_orientacija'].': </label>';
 		echo '<span class="content"><select name="orientation" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="getOrientation(this.value); show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_preset_value(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_custom_picture_radio(\''.$row['id'].'\', this.value); show_hot_spot_settings(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
 			echo '<option value="1"' . ($row['orientation'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
 			echo '<option value="7"' . ($row['orientation'] == 7 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna_2'].'</option>';
@@ -3369,7 +3272,10 @@ class Vprasanje {
             echo '<option value="11"' . ($row['orientation'] == 11 ? ' selected="true"' : '') . '>'.$lang['srv_visual_analog_scale'].'</option>';	//vizualna analaogna skala - smeški
             echo '<option value="5"' . ($row['hidden_default'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_potrditev'].'</option>';
 		echo '</select></span>';
-		echo '</p>';
+
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// editiranje orientacije chackboxa 
@@ -3379,24 +3285,26 @@ class Vprasanje {
 
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		echo '<p>';
-		echo '<span class="title">'.$lang['srv_orientacija'].':</span>';
-		//echo '<span class="content"><select name="orientation" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="getOrientation(this.value); show_selectbox_size(\'' . $row['id'] . '\', this.value);">';
-		echo '<span class="content"><select name="orientation" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="getOrientation(this.value); show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_preset_value(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_hot_spot_settings(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
-			echo '<option value="1"' . ($row['orientation'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
-			echo '<option value="7"' . ($row['orientation'] == 7 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna_2'].'</option>';
-			echo '<option value="0"' . ($row['orientation'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna'].'</option>';
-			echo '<option value="2"' . ($row['orientation'] == 2 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna_2'].'</option>';
-			echo '<option value="6"' . ($row['orientation'] == 6 ? ' selected="true"' : '') . '>'.$lang['srv_select-box_check'].'</option>';
-			echo '<option value="8"' . ($row['orientation'] == 8 ? ' selected="true"' : '') . '>'.$lang['srv_drag_drop'].'</option>';
-			echo '<option value="10"' . ($row['orientation'] == 10 ? ' selected="true"' : '') . '>'.$lang['srv_hot_spot'].'</option>';	//image hotspot
-			if ($admin_type == 0){
-				//echo '<option value="6"' . ($row['orientation'] == 6 ? ' selected="true"' : '') . '>'.$lang['srv_select-box_check'].'</option>';
+		echo '<div class="vprasanje_setting_holder">';
 
-			}
-			//echo '<option value="6"' . ($row['orientation'] == 6 ? ' selected="true"' : '') . '>'.$lang['srv_mutliselect-box'].'</option>';
-		echo '</select>';
-		echo '</span></p>';
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_orientacija'].':</label>';
+
+        echo '<span class="content"><select name="orientation" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="getOrientation(this.value); show_selectbox_size(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_preset_value(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\'); show_hot_spot_settings(\'' . $row['id'] . '\', this.value, \'' . $row['tip'] . '\');">';
+        echo '<option value="1"' . ($row['orientation'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna'].'</option>';
+        echo '<option value="7"' . ($row['orientation'] == 7 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_vertikalna_2'].'</option>';
+        echo '<option value="0"' . ($row['orientation'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna'].'</option>';
+        echo '<option value="2"' . ($row['orientation'] == 2 ? ' selected="true"' : '') . '>'.$lang['srv_orientacija_horizontalna_2'].'</option>';
+        echo '<option value="6"' . ($row['orientation'] == 6 ? ' selected="true"' : '') . '>'.$lang['srv_select-box_check'].'</option>';
+        echo '<option value="8"' . ($row['orientation'] == 8 ? ' selected="true"' : '') . '>'.$lang['srv_drag_drop'].'</option>';
+        echo '<option value="10"' . ($row['orientation'] == 10 ? ' selected="true"' : '') . '>'.$lang['srv_hot_spot'].'</option>';	//image hotspot
+        echo '</select>';
+		echo '</span>';
+
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// navaden number ali slider
@@ -3405,20 +3313,20 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		echo '<p>';
-		echo '<span class="title">'.$lang['srv_number_insert'].':</span>';
-		// //echo '<span class="content"><select name="ranking_k" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" class="no_submit" onchange="change_subtype_number(\''.$row['id'].'\');">';
-		// echo '<span class="content"><select name="ranking_k" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" class="no_submit" onchange="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)">';
-			// echo '<option value="0"' . ($row['ranking_k'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_0'].'</option>';
-			// echo '<option value="1"' . ($row['ranking_k'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_1'].'</option>';
-		// echo '</select>';
-		//echo '<p>';
-		echo '<span class="content">';
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_number_insert'].':</label>';
+
+        echo '<span class="content">';
 		echo '<input type="radio" name="ranking_k" id="select_num_0" value="0" '.(($row['ranking_k'] == 0) ? ' checked="checked" ' : '').' onClick="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)" /><label for="select_num_0">'.$lang['srv_number_insert_0_new'].'</label>';
 		echo '<input type="radio" name="ranking_k" id="select_num_1" value="1" '.(($row['ranking_k'] == 1) ? ' checked="checked" ' : '').' onClick="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)"/><label for="select_num_1">'.$lang['srv_number_insert_1'].'</label>';
+		echo '</span>';
 
-		//echo '</p>';
-		echo '</span></p>';
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// navaden number ali slider
@@ -3427,23 +3335,19 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		echo '<p>';
-		echo '<span class="title">'.$lang['srv_number_insert'].':</span>';				
-		// echo '<span class="content"><select name="ranking_k" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" class="no_submit" onchange="change_subtype_number(\''.$row['id'].'\');">';
-			// echo '<option value="0"' . ($row['ranking_k'] == 0 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_0'].'</option>';
-			// echo '<option value="1"' . ($row['ranking_k'] == 1 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_1'].'</option>';
-			// echo '<option value="2"' . ($row['ranking_k'] == 2 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_2'].'</option>';
-			// echo '<option value="3"' . ($row['ranking_k'] == 3 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_3'].'</option>';
-			// echo '<option value="4"' . ($row['ranking_k'] == 4 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_4'].'</option>';
-			// echo '<option value="5"' . ($row['ranking_k'] == 5 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_5'].'</option>';
-			// echo '<option value="6"' . ($row['ranking_k'] == 6 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_6'].'</option>';
-			//echo '<option value="7"' . ($row['ranking_k'] == 7 ? ' selected="true"' : '') . '>'.$lang['srv_number_insert_7'].'</option>';
-		//echo '</select>';
-		//echo '</span></p>';
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_number_insert'].':</label>';
+        echo '<span class="content">';
 		echo '<input type="radio" name="ranking_k" value="0" '.(($row['ranking_k'] == 0) ? ' checked="checked" ' : '').' onChange="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)" /><label for="skala_0" class="spaceRight">'.$lang['srv_number_insert_0_new'].'</label>';
 		echo '<input type="radio" name="ranking_k" value="1" '.(($row['ranking_k'] == 1) ? ' checked="checked" ' : '').' onChange="change_subtype_number(\''.$row['id'].'\'); show_slider_prop(\''.$row['id'].'\',this.value)"/><label for="skala_1">'.$lang['srv_number_insert_1'].'</label>';
-		echo '</p>';
-		
+		echo '</span>';
+
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// prikaz statistike
@@ -3452,13 +3356,18 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		echo '<p>';
-		echo '<label for="stat" class="title">'.$lang['srv_stat_on'].': '.Help::display('srv_statistika').'</label>';
-		//echo '<span class="content"><input type="radio" name="stat" value="0" '.(($row['stat'] == 0) ? ' checked="checked" ' : '').' />'.$lang['no1'];		
-		//echo '<input type="radio" name="stat" value="1" '.(($row['stat'] == 1) ? ' checked="checked" ' : '').' />'.$lang['yes'];
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label for="stat">'.$lang['srv_stat_on'].': '.Help::display('srv_statistika').'</label>';
 		echo '<span class="content"><input type="hidden" name="stat" value="0" />';		
 		echo '<input type="checkbox" id="stat" name="stat" value="1" '.(($row['stat'] == 1) ? ' checked="checked" ' : '').' />';
-		echo '</span></p>';
+		echo '</span>';
+
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// upload pri tekstovnem polju
@@ -3473,15 +3382,22 @@ class Vprasanje {
 		
 		$disabled = ($row['signature']==1 || $captcha==1 || $emailVerify==1) ? ' disabled="disabled"' : '';
 	
-		echo '<p>';
-		echo '<span class="title">'.$lang['srv_vprasanje_upload_type'].':</span>';
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_vprasanje_upload_type'].':</label>';
                                 
 		//novo, dropdown s fotografijami        onChange="change_upload(\'' . $row['id'] . '\', this.value);"
 		echo '<span class="content"><select name="upload" id="spremenljivka_upload_' . $row['id'] . '" spr_id="'.$row['id'].'" '.$disabled.' onChange="textSubtypeToggle(\'upload\', this.value);">';
 		echo '	<option value="0" '.(($row['upload'] == 0) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_upload_no'].'</option>';
 		echo '	<option value="1" '.(($row['upload'] == 1) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_upload_yes'].'</option>';
 		echo '	<option value="2" '.(($row['upload'] == 2) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_upload_fotografija'].'</option></select>';
-		echo '</p>';
+		echo '</span>';
+
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// podpis pri tekstovnem polju
@@ -3501,16 +3417,21 @@ class Vprasanje {
 		$emailVerify = ($spremenljivkaParams->get('emailVerify') ? $spremenljivkaParams->get('emailVerify') : 0);
 		
         $disabled = ($row['upload']>0 || $captcha==1 || $emailVerify==1) ? ' disabled="disabled"' : '';
-        			
-		echo '<p>';
-		echo '<span class="title">'.$lang['srv_tip_standard_996'].':</span>';
-		
+        	
+        
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_tip_standard_996'].':</label>';
 		echo '<span class="content">';
 		echo '<input type="radio" id="signature_'.$this->spremenljivka.'_0" name="signature" '.$disabled.' onclick="signatureProp('.$this->spremenljivka.'); textSubtypeToggle(\'signature\', this.value);" value="0" '.(($row['signature'] == 0) ? ' checked="checked" ' : '').' /><label for="signature_'.$this->spremenljivka.'_0">'.$lang['no1'].'</label>';		
 		echo '<input type="radio" id="signature_'.$this->spremenljivka.'" name="signature" '.$disabled.' onclick="signatureProp('.$this->spremenljivka.'); textSubtypeToggle(\'signature\', this.value);" value="1" '.(($row['signature'] == 1) ? ' checked="checked" ' : '').' /><label for="signature_'.$this->spremenljivka.'">'.$lang['yes'].'</label>';
 		echo '</span>';
 		
-		echo '</p>';
+		echo '</div>';
+
+		echo '</div>';
 	}
 	
 	// nastavitev timerja
@@ -4149,26 +4070,16 @@ class Vprasanje {
 	/**
 	* prikaze gumbe
 	*/
-	function edit_buttons () {
+	private function edit_buttons () {
 		global $lang;
 		
-		echo '<div id="vprasanje_buttons">';
+		echo '<button class="small blue" onclick="vprasanje_save(); return false;">';
+        echo $lang['srv_zapri'];
+        echo '</button>';
 		
-		echo '<span class="buttonwrapper spaceLeft floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_orange" href="#" onclick="vprasanje_save(); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
-        echo '</span>';
-        
-		/*echo '<span class="buttonwrapper spaceLeft floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="vprasanje_cancel(); return false;"><span>'.$lang['srv_close_profile'].'</span></a>'."\n\r";
-		echo '</span>';*/
-		
-		echo '<span class="buttonwrapper spaceLeft floatLeft">';
-        echo '<a class="ovalbutton ovalbutton_gray" href="#" onclick="brisi_spremenljivko(\''.$this->spremenljivka.'\', undefined, \'0\'); return false;"><span>'.$lang['srv_brisispremenljivko'].'</span></a>'."\n\r";
-		echo '</span>';
-		
-		//echo '<div id="arrows_more_vprasanje" onclick=" $(\'#vprasanje_edit\').animate({ scrollTop: $(\'#vprasanje_edit\').attr(\'scrollHeight\') }, 2000); "><img src="img_0/bullet_arrow_down.png" /> '.$lang['srv_more'].'</div>';
-		
-		echo '</div>';
+		/*echo '<button class="small blue" onclick="brisi_spremenljivko(\''.$this->spremenljivka.'\', undefined, \'0\'); return false;">';
+        echo $lang['srv_brisispremenljivko'];
+		echo '</button>';*/
 	}
 	
 	/**
@@ -4542,8 +4453,11 @@ class Vprasanje {
 		
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 	
-		echo '<p>';
-		echo '<span class="title">'.$lang['srv_vprasanje_podtip_map'].':</span>';
+		echo '<div class="vprasanje_setting_holder">';
+
+		echo '<div class="vprasanje_setting_line half-half">';
+
+		echo '<label>'.$lang['srv_vprasanje_podtip_map'].':</label>';
 		echo '<span class="content">';
                 echo '<select name="podtip_lokacija" id="spremenljivka_podtip_' . $row['id'] . '" spr_id="'.$row['id'].'" onChange="change_map(this.value, '.$this->spremenljivka.');">';
                     echo '<option value="1" '.(($row['enota'] == 1) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_mylocation'].'</option>';
@@ -4551,7 +4465,10 @@ class Vprasanje {
                     echo '<option value="3" '.(($row['enota'] == 3) ? ' selected="true" ' : '').'>'.$lang['srv_vprasanje_chooselocation'].'</option>';
 			
 		echo '</select></span>';
-		echo '</p>';
+
+		echo '</div>';
+
+		echo '</div>';
 	}
         
 	/**
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index e8b046464..79a2090e5 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -115,7 +115,7 @@ function vprasanje_pozicija (spremenljivka) {
 	var elHeight = $(id).height();
 	
 	//$('#vprasanje_float_editing').css('top', elTop-163).show();
-	$('#vprasanje_float_editing').css('margin-top', elTop-163).show();
+	$('#vprasanje_float_editing').css('margin-top', elTop-220).show();
 	
 	var floatingTop = $('#vprasanje_float_editing').offset().top - 40;	// ker je premaknjeno navzgor
 	var floatingHeight = $('#vprasanje_float_editing').height() + 40;
diff --git a/lang/1.php b/lang/1.php
index a6997f190..30fde85c8 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5686,6 +5686,7 @@ $lang = array (
 	"srv_std_second"							=>	'Privzeti prevod',
 	"srv_std_translation"						=>	'Popravek privzetega prevoda',
 	"srv_select_type"							=>	'Izberite tip vprašanja',
+	"srv_common_settings"   					=>	'Pogoste nastavitve',
 	"srv_question_type"							=>	'Tip vprašanja',
 	"srv_dropdown_select"						=>	'Izberite',
 	"srv_added_false"							=>	'Uporabnik s tem e-mail naslovom je že registriran.',
diff --git a/lang/2.php b/lang/2.php
index e06dd9751..b6f5593a4 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5583,6 +5583,7 @@ $lang = array (
 	"srv_std_second"							=>	'Translated text',
 	"srv_std_translation"						=>	'Custom translation',
 	"srv_select_type"							=>	'Select type',
+    "srv_common_settings"   					=>	'Common settings',
 	"srv_question_type"							=>	'Question type',
 	"srv_dropdown_select"						=>	'Select',
 	"srv_added_false"							=>	'User with this e-mail is already registered.',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 715add426..07744963d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -11422,13 +11422,13 @@ div#variabla_new span.correct {
 */
 #placeholder {
   display: flex;
-  width: calc(100vw - 328px);
-  margin: 0 0 0 308px;
+  width: calc(100vw - 320px);
+  margin: 0 0 0 300px;
 }
 
 #branching {
   min-height: 400px;
-  width: calc(96% - 315px);
+  width: calc(100% - 400px);
   margin: 0;
   background-color: white;
 }
@@ -11725,83 +11725,71 @@ and open the template in the editor.
   position: relative;
   z-index: 70;
   align-self: flex-start;
+  margin-left: 50px;
+}
+#vprasanje_float_editing .vprasanje_edit_holder {
+  display: flex;
+  flex-direction: column;
   box-sizing: border-box;
   width: 305px;
-  margin-left: 20px;
-  border: 1px solid #1E88E5;
-  background-color: white;
-  box-shadow: 0 0 31px 0 rgba(0, 0, 0, 0.07);
+  border: 1px solid #E5E5E5;
+  background-color: #FFFFFF;
+  background: #FFFFFF;
 }
-#vprasanje_float_editing #vprasanje_tabs {
-  margin-top: -1px;
-  position: absolute;
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_header {
+  height: 45px;
+  padding: 0 7px;
+  color: #FFFFFF;
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 45px;
   background-color: #1E88E5;
-  width: 100%;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_tabs {
   z-index: 100;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: nowrap;
+  width: 100%;
+  height: 45px;
+  margin-bottom: 16px;
+  background-color: #F8F8F8;
 }
-#vprasanje_float_editing #vprasanje_tabs select {
-  float: right;
-  margin: 5px 10px 0 0;
-  width: 100px;
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_tabs .tab_link {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 45px;
+  padding: 0 5px;
 }
-#vprasanje_float_editing #vprasanje_tabs a.tab_link {
-  float: left;
-  display: block;
-  height: 19px;
-  padding: 7px 4px;
-  margin: 0 1px 0 0;
-  font-size: 12px;
-  border-bottom: 1px solid #1E88E5;
-  color: #E5E5E5;
-  background-color: #1E88E5;
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_tabs .tab_link.active {
+  background-color: #FFFFFF;
 }
-#vprasanje_float_editing #vprasanje_tabs a.tab_link.active {
-  border-bottom: 1px solid white;
-  margin: 0 1px 0 0;
-  color: #E5E5E5;
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_tabs .tab_link.active span {
+  color: #333333;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_tabs .tab_link span {
+  height: 25px;
+  line-height: 25px;
+  font-size: 13px;
+  color: #777777;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit {
+  margin: 0 16px;
   background-color: white;
 }
-#vprasanje_float_editing #vprasanje_tabs .tab_link_tracking {
-  position: absolute;
-  right: 0;
-  top: -59px;
-  width: 30px;
-}
-#vprasanje_float_editing #vprasanje_tabs .tab_link_tracking a.tab_link {
-  background-color: white;
-  color: #1E88E5;
-  padding: 0;
-}
-#vprasanje_float_editing #vprasanje_tabs .tab_link_tracking a.tab_link.active {
-  background-color: white;
-  color: white;
-}
-#vprasanje_float_editing #vprasanje_edit {
-  margin: 0px 0px;
-  position: relative;
-  top: -54px;
-  background-color: white;
-}
-#vprasanje_float_editing #vprasanje_edit h2 {
-  padding: 10px;
-  border: 1px solid #1E88E5;
-  border-bottom: 0;
-  margin: 15px -11px 42px -11px;
-  background-color: #1E88E5;
-}
-#vprasanje_float_editing #vprasanje_edit h2 span.content {
-  position: absolute;
-  font-weight: normal;
-  right: 10px;
-  top: 10px;
-}
-#vprasanje_float_editing #vprasanje_edit fieldset {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset {
+  display: flex;
+  flex-direction: column;
   margin-bottom: 16px;
   padding: 0;
   border: 0;
   border-top: 1px solid #D3D3D3;
 }
-#vprasanje_float_editing #vprasanje_edit legend {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset legend {
   margin: 0;
   padding: 0 10px 0 5px;
   color: #333333;
@@ -11810,83 +11798,113 @@ and open the template in the editor.
   text-transform: none;
   background-color: transparent;
 }
-#vprasanje_float_editing #vprasanje_edit .jquery-selectbox {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset .vprasanje_setting_holder {
+  display: flex;
+  flex-direction: column;
+  margin-top: 8px;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset .vprasanje_setting_holder .vprasanje_setting_line {
+  display: flex;
+  align-items: center;
+  justify-content: left;
+  min-height: 20px;
+  margin-top: 8px;
+  line-height: 20px;
+  color: #333333;
+  font-size: 14px;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset .vprasanje_setting_holder .vprasanje_setting_line.half-half {
+  justify-content: space-between;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset .vprasanje_setting_holder .vprasanje_setting_line.half-half label {
+  width: 50%;
+  margin: 0;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset .vprasanje_setting_holder .vprasanje_setting_line.half-half .content {
+  width: 50%;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset p,
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset span,
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit fieldset label {
+  line-height: 20px;
+  color: #333333;
+  font-size: 14px;
+}
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit .jquery-selectbox {
   background-color: white;
 }
-#vprasanje_float_editing #vprasanje_edit form[name=vprasanje_edit] {
-  padding: 0 10px;
-}
-#vprasanje_float_editing #vprasanje_edit p {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p {
   padding: 1px 3px;
   line-height: 18px;
 }
-#vprasanje_float_editing #vprasanje_edit p input[type=radio] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p input[type=radio] {
   vertical-align: middle;
   margin: 0px 3px 0px 10px;
 }
-#vprasanje_float_editing #vprasanje_edit p label.title {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p label.title {
   cursor: pointer;
   max-width: 270px;
 }
-#vprasanje_float_editing #vprasanje_edit p span.content {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p span.content {
   float: right;
   display: inline-block;
 }
-#vprasanje_float_editing #vprasanje_edit p span.content select {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p span.content select {
   margin-top: -4px;
 }
-#vprasanje_float_editing #vprasanje_edit p span.content select.no-margin {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p span.content select.no-margin {
   margin-top: 0;
 }
-#vprasanje_float_editing #vprasanje_edit p span.content input[type=checkbox] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p span.content input[type=checkbox] {
   vertical-align: middle;
   margin: 0px 3px 0px 3px;
 }
-#vprasanje_float_editing #vprasanje_edit div {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit div {
   padding: -10px;
 }
-#vprasanje_float_editing #vprasanje_edit p.heading {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit p.heading {
   border: 0;
   background: none;
   padding: 0;
   margin-bottom: -7px;
   margin-top: -2px;
 }
-#vprasanje_float_editing #vprasanje_edit textarea[name=naslov] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit textarea[name=naslov] {
   width: 99%;
   height: 60px;
 }
-#vprasanje_float_editing #vprasanje_edit textarea[name=introduction] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit textarea[name=introduction] {
   width: 99%;
   height: 60px;
 }
-#vprasanje_float_editing #vprasanje_edit textarea[name=conclusion] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit textarea[name=conclusion] {
   width: 99%;
   height: 60px;
 }
-#vprasanje_float_editing #vprasanje_edit textarea[name=statistics] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit textarea[name=statistics] {
   width: 99%;
   height: 60px;
 }
-#vprasanje_float_editing #vprasanje_edit textarea[name=info] {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit textarea[name=info] {
   width: 98%;
   height: 12px;
 }
-#vprasanje_float_editing #vprasanje_edit li textarea {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit li textarea {
   height: 12px;
 }
-#vprasanje_float_editing #vprasanje_edit span#vprasanje_edit_mv select {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit span#vprasanje_edit_mv select {
   width: 100%;
 }
-#vprasanje_float_editing #vprasanje_edit #vprasanje_edit_bottom_placeholder {
+#vprasanje_float_editing .vprasanje_edit_holder #vprasanje_edit #vprasanje_edit_bottom_placeholder {
   display: block;
   height: 1px;
   margin: 0 10px;
   border-top: 1px solid #1E88E5;
 }
-#vprasanje_float_editing #vprasanje_buttons {
-  position: absolute;
-  bottom: 15px;
+#vprasanje_float_editing .vprasanje_edit_holder .button_holder {
+  margin: 0 16px 10px 16px;
+  padding-top: 8px;
+  border-top: 1px #D3D3D3 solid;
 }
 
 /*
@@ -11992,11 +12010,13 @@ li.spr .spr_edit span.scale_ordnom {
   vertical-align: 2px;
   margin-right: 20px;
 }
-li.spr .spr_edit span.scale_ordnom a {
+li.spr .spr_edit span.scale_ordnom a,
+li.spr .spr_edit span.scale_ordnom span {
   display: inline-block;
   height: 20px;
   width: auto;
   margin: 0;
+  font-size: 14px;
 }
 li.spr:hover .spr_edit {
   display: block;
@@ -12210,7 +12230,7 @@ li.spr_editing div[contenteditable][default="1"] {
   color: #333333;
 }
 li.spr_editing .variable_name {
-  color: white;
+  color: #FFFFFF !important;
 }
 
 .variable_holder.clr {
diff --git a/resources/sass/admin_new/pages/survey_edit/branching.scss b/resources/sass/admin_new/pages/survey_edit/branching.scss
index 8f5e70314..e7c5ffb02 100644
--- a/resources/sass/admin_new/pages/survey_edit/branching.scss
+++ b/resources/sass/admin_new/pages/survey_edit/branching.scss
@@ -5,15 +5,15 @@
 #placeholder{
     display: flex;
 
-    width: calc(100vw - 328px);
+    width: calc(100vw - 320px);
     //max-width: 1500px;
 
-    margin: 0 0 0 308px;
+    margin: 0 0 0 300px;
 }
 
 #branching {
 	min-height: 400px;
-    width: calc(96% - 315px);
+    width: calc(100% - 400px);
     margin: 0;
 
     background-color: white;
diff --git a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
index 03b4f073f..f58a0a60e 100644
--- a/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/question_right_settings.scss
@@ -21,196 +21,242 @@
     z-index: 70;
     align-self: flex-start;
         
-    box-sizing: border-box;
-    width: 305px;
-    margin-left: 20px;
+    margin-left: 50px;
     
-	border: 1px solid $blue;
-    background-color: white;
-    box-shadow: 0 0 31px 0 rgba(0, 0, 0, 0.07);
+    // Celoten div z vsebino
+    .vprasanje_edit_holder{
+        display: flex;
+        flex-direction: column;
 
+        box-sizing: border-box;
+        width: 305px;
 
-    // Tabi na vrhu
-    #vprasanje_tabs {
-        select {
-            float: right;
-            margin: 5px 10px 0 0;
-            width: 100px;
-        }
-        margin-top: -1px;
-        position: absolute;
-        background-color: $blue;
-        width: 100%;
-        z-index: 100;
-        a.tab_link {
-            float: left;
-            display: block;
-            height: 19px;
-            padding: 7px 4px;
-                    margin: 0 1px 0 0;
-            font-size: 12px;
-                    border-bottom: 1px solid $blue;
-            color: $gray;
-            background-color: $blue;
-        }
-        a.tab_link.active {
-                    border-bottom: 1px solid white;
-                    margin: 0 1px 0 0;
-            color: $gray;
-            background-color: white;
-        }
-        .tab_link_tracking {
-            position: absolute;
-            right: 0;
-            top: -59px;
-            width: 30px;
-            a.tab_link {
-                background-color: white;
-                color: $blue;
-                padding: 0;
-            }
-            a.tab_link.active {
-                background-color: white;
-                color: white;
-            }
-        }
-    }
+        border: 1px solid $gray;
+        background-color: $white;
+        background: #FFFFFF;
 
-    // Glavna vsebina
-    #vprasanje_edit {
-        margin: 0px 0px;
-        position: relative;
-        top: -54px;
-        
-        background-color: white;
-        
-        h2 {
-            span.content {
-                position: absolute;
-                font-weight: normal;
-                right: 10px;
-                top: 10px;
-            }
-            padding: 10px;
-                    border: 1px solid $blue;
-            border-bottom: 0;
-            margin: 15px -11px 42px -11px;
-            background-color: $blue;
-        }
-        
-        fieldset {
-            margin-bottom: 16px;
-            padding: 0;
+        // Naslovna vrstica
+        #vprasanje_header{
+            height: 45px;
+            padding: 0 7px;
 
-            border: 0;
-            border-top: 1px solid #D3D3D3;
-        }
-
-        legend {
-            margin: 0;
-            padding: 0 10px 0 5px;
-
-            color: $black;
-            font-weight: 700;
+            color: $white;
+            font-weight: 600;
             font-size: 14px;
-            text-transform: none;
-            
-            background-color: transparent;
-        }
-        
-        .jquery-selectbox {
-            background-color: white;
+            line-height: 45px;
+
+            background-color: $blue;
         }
 
-        form[name=vprasanje_edit] {
-            padding: 0 10px;
-        }
-        
-        p {
-            padding: 1px 3px;
-            line-height: 18px;
-            
-            input[type=radio] {
-                vertical-align: middle;
-                margin: 0px 3px 0px 10px;
-            }
-            
-            label.title {
+        // Tabi na vrhu
+        #vprasanje_tabs {    
+            z-index: 100;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            flex-wrap: nowrap;
+
+            width: 100%;
+            height: 45px;
+
+            margin-bottom: 16px;
+
+            background-color: $light-gray;
+
+            .tab_link {
                 cursor: pointer;
-                max-width: 270px;
+                display: flex; 
+                align-items: center;
+                justify-content: center;
+
+                width: 100%;
+                height: 45px;
+
+                padding: 0 5px;
+
+                &.active {
+                    background-color: $white;
+
+                    span{
+                        color: $black;
+                    }
+                }
+
+                span{
+                    height: 25px;
+
+                    line-height: 25px;
+                    font-size: 13px;
+                    color: $very-dark-gray;
+                }
+            }
+        }
+
+        // Glavna vsebina
+        #vprasanje_edit {
+            margin: 0 16px;
+
+            background-color: white;
+                        
+            fieldset {
+                display: flex;
+                flex-direction: column;
+
+                margin-bottom: 16px;
+                padding: 0;
+
+                border: 0;
+                border-top: 1px solid #D3D3D3;
+
+
+                legend {
+                    margin: 0;
+                    padding: 0 10px 0 5px;
+    
+                    color: $black;
+                    font-weight: 700;
+                    font-size: 14px;
+                    text-transform: none;
+                    
+                    background-color: transparent;
+                }
+
+                .vprasanje_setting_holder{
+                    display: flex;
+                    flex-direction: column;
+
+                    margin-top: 8px;
+
+                    .vprasanje_setting_line{
+                        display: flex;
+                        align-items: center;
+                        justify-content: left;
+    
+                        min-height: 20px;
+                        margin-top: 8px;
+    
+                        line-height: 20px;
+                        color: $black;
+                        font-size: 14px;
+
+                        &.half-half{
+                            justify-content: space-between;
+
+                            label{
+                                width: 50%;
+                                margin: 0;
+                            }
+
+                            .content{
+                                width: 50%;
+                            }
+                        }
+                    }
+                }
+                
+                p, 
+                span,
+                label{
+                    line-height: 20px;
+                    color: $black;
+                    font-size: 14px;
+                }
+            }
+
+            
+            
+            .jquery-selectbox {
+                background-color: white;
             }
             
-            span.content {
-                float: right;
-                display: inline-block;
-                    select {
-                            margin-top: -4px;
-                    }
-                    select.no-margin {
-                            margin-top: 0;
-                    }
-                    input[type=checkbox] {
-                            vertical-align: middle;
-                            margin: 0px 3px 0px 3px;
-                    }
+            p {
+                padding: 1px 3px;
+                line-height: 18px;
+                
+                input[type=radio] {
+                    vertical-align: middle;
+                    margin: 0px 3px 0px 10px;
+                }
+                
+                label.title {
+                    cursor: pointer;
+                    max-width: 270px;
+                }
+                
+                span.content {
+                    float: right;
+                    display: inline-block;
+                        select {
+                                margin-top: -4px;
+                        }
+                        select.no-margin {
+                                margin-top: 0;
+                        }
+                        input[type=checkbox] {
+                                vertical-align: middle;
+                                margin: 0px 3px 0px 3px;
+                        }
+                }
             }
-        }
-        div {
-            padding: -10px;
-        }
-        p.heading {
-            border: 0;
-            background: none;
-            padding: 0;
-            margin-bottom: -7px;
-            margin-top: -2px;
-        }
-        
-        textarea[name=naslov] {
-            width: 99%;
-            height: 60px;
-        }
-        textarea[name=introduction] {
-            width: 99%;
-            height: 60px;
-        }
-        textarea[name=conclusion] {
-            width: 99%;
-            height: 60px;
-        }
-        textarea[name=statistics] {
-            width: 99%;
-            height: 60px;
-        }
-        textarea[name=info] {
-            width: 98%;
-            height: 12px;
-        }
-        
-        li {
-            textarea {
+            div {
+                padding: -10px;
+            }
+            p.heading {
+                border: 0;
+                background: none;
+                padding: 0;
+                margin-bottom: -7px;
+                margin-top: -2px;
+            }
+            
+            textarea[name=naslov] {
+                width: 99%;
+                height: 60px;
+            }
+            textarea[name=introduction] {
+                width: 99%;
+                height: 60px;
+            }
+            textarea[name=conclusion] {
+                width: 99%;
+                height: 60px;
+            }
+            textarea[name=statistics] {
+                width: 99%;
+                height: 60px;
+            }
+            textarea[name=info] {
+                width: 98%;
                 height: 12px;
             }
-        }
-        
-        span#vprasanje_edit_mv {
-            select {
-                width: 100%;
+            
+            li {
+                textarea {
+                    height: 12px;
+                }
+            }
+            
+            span#vprasanje_edit_mv {
+                select {
+                    width: 100%;
+                }
+            }
+
+            #vprasanje_edit_bottom_placeholder {
+                display: block;
+                height: 1px;
+                margin: 0 10px;
+                border-top: 1px solid $blue;
             }
         }
 
-        #vprasanje_edit_bottom_placeholder {
-            display: block;
-            height: 1px;
-            margin: 0 10px;
-            border-top: 1px solid $blue;
+        // Gumbi na dnu
+        .button_holder {
+            margin: 0 16px 10px 16px;
+            padding-top: 8px;
+
+            border-top: 1px #D3D3D3 solid;
         }
-    }
 
-    // Gumbi na dnu
-    #vprasanje_buttons {
-        position: absolute;
-        bottom: 15px;
     }
-
 }
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
index ca5b5b20b..7d00a5cd2 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
@@ -103,11 +103,14 @@ li.spr{
 			vertical-align: 2px;
 			margin-right: 20px;
 
-			a {
+			a,
+            span {
 				display: inline-block;
 				height: 20px;
 				width: auto;
 				margin: 0;
+
+                font-size: 14px;
 			}
 		}
     }
@@ -383,7 +386,7 @@ li.spr_editing {
 	}
 
     .variable_name {
-        color: white;
+        color: $white !important;
     }
 }