diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 9b74555d3..a0441173f 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -8315,7 +8315,7 @@ class Vprasanje {
         echo '      <span class="content">';
 
 		echo '          <input type="checkbox" value="1" name="diferencial_trak" '.( $diferencial_trak == 1 ? ' checked="checked"' : '') .' onChange="diferencial_trak_checkbox_prop('.$this->spremenljivka.', '.$row['grids'].');" id="diferencial_trak_'.$this->spremenljivka.'">';
-        echo '          <label for="diferencial_trak_'.$this->spremenljivka.'">'.$lang['srv_diferencial_trak'].Help::display('srv_vprasanje_trak').':</label>';
+        echo '          <label for="diferencial_trak_'.$this->spremenljivka.'">'.$lang['srv_diferencial_trak'].Help::display('srv_vprasanje_trak').'</label>';
 		echo '          <input '.$disable_diferencial_trak_hidden.' type="hidden" value="0" name="diferencial_trak" id="diferencial_trak_hidden_'.$this->spremenljivka.'">';
 
         echo '      </span>';
@@ -8446,17 +8446,19 @@ class Vprasanje {
 		$display = ( ( $row['tip'] == 6 && ($row['enota'] == 0 || $row['enota'] == 1) ) || ( $row['tip'] == 16 && ($row['enota'] == 0 || $row['enota'] == 1) ) ) && ($diferencial_trak == 0) ? '' : 'style="display:none;"';
 		
 	
-		echo '<div class="drop_custom_column_labels" '.$display.'>';
+        echo '<div class="vprasanje_setting_holder drop_custom_column_labels" '.$display.'>';	
         
-        echo '<p><span class="title" >'.$lang['srv_custom_column_labels_presentation'].':</span>';
+        echo '  <div class="vprasanje_setting_line half-half">';
         
-		echo '<span class="content"><select name="custom_column_label_option" id="custom_column_label_option_'.$row['id'].'" >';
-		echo '<option value="1"'.($custom_column_label_option=='1'?' selected':'').'>'.$lang['srv_custom_column_labels_o1'].'</option>';
-		echo '<option value="2"'.($custom_column_label_option=='2'?' selected':'').'>'.$lang['srv_custom_column_labels_o2'].'</option>';
-		echo '<option value="3"'.($custom_column_label_option=='3'?' selected':'').'>'.$lang['srv_custom_column_labels_o3'].'</option>';
-		echo '</select></span>';
+        echo '      <label>'.$lang['srv_custom_column_labels_presentation'].':</label>';
         
-        echo '</p>';
+		echo '      <span class="content"><select name="custom_column_label_option" id="custom_column_label_option_'.$row['id'].'" >';
+		echo '          <option value="1"'.($custom_column_label_option=='1'?' selected':'').'>'.$lang['srv_custom_column_labels_o1'].'</option>';
+		echo '          <option value="2"'.($custom_column_label_option=='2'?' selected':'').'>'.$lang['srv_custom_column_labels_o2'].'</option>';
+		echo '          <option value="3"'.($custom_column_label_option=='3'?' selected':'').'>'.$lang['srv_custom_column_labels_o3'].'</option>';
+		echo '      </select></span>';
+        
+        echo '  </div>';
         
         echo '</div>';
     }
@@ -8470,19 +8472,22 @@ class Vprasanje {
         
 		$grid_repeat_header = ($spremenljivkaParams->get('grid_repeat_header') ? $spremenljivkaParams->get('grid_repeat_header') : 0);
 
-		echo '<div class="grid_repeat_header">';
+
+        echo '<div class="vprasanje_setting_holder grid_repeat_header">';	
+
+        echo '  <div class="vprasanje_setting_line half-half">';
         
-        echo '<p><span class="title" >'.$lang['srv_grid_repeat_header'].':</span>';
+        echo '      <label>'.$lang['srv_grid_repeat_header'].':</label>';
         
-		echo '<span class="content"><select name="grid_repeat_header" id="grid_repeat_header_'.$row['id'].'" >';
-		echo '<option value="0"'.($grid_repeat_header=='0'?' selected':'').'>'.$lang['srv_grid_repeat_header_0'].'</option>';
-		echo '<option value="5"'.($grid_repeat_header=='5'?' selected':'').'>'.$lang['srv_grid_repeat_header_5'].'</option>';
-		echo '<option value="10"'.($grid_repeat_header=='10'?' selected':'').'>'.$lang['srv_grid_repeat_header_10'].'</option>';
-		echo '<option value="15"'.($grid_repeat_header=='15'?' selected':'').'>'.$lang['srv_grid_repeat_header_15'].'</option>';
-		echo '<option value="20"'.($grid_repeat_header=='20'?' selected':'').'>'.$lang['srv_grid_repeat_header_20'].'</option>';
-		echo '</select></span>';
+		echo '      <span class="content"><select name="grid_repeat_header" id="grid_repeat_header_'.$row['id'].'" >';
+		echo '          <option value="0"'.($grid_repeat_header=='0'?' selected':'').'>'.$lang['srv_grid_repeat_header_0'].'</option>';
+		echo '          <option value="5"'.($grid_repeat_header=='5'?' selected':'').'>'.$lang['srv_grid_repeat_header_5'].'</option>';
+		echo '          <option value="10"'.($grid_repeat_header=='10'?' selected':'').'>'.$lang['srv_grid_repeat_header_10'].'</option>';
+		echo '          <option value="15"'.($grid_repeat_header=='15'?' selected':'').'>'.$lang['srv_grid_repeat_header_15'].'</option>';
+		echo '          <option value="20"'.($grid_repeat_header=='20'?' selected':'').'>'.$lang['srv_grid_repeat_header_20'].'</option>';
+		echo '      </select></span>';
         
-        echo '</p>';
+        echo '  </div>';
         
         echo '</div>';
     }