diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index f905bfc80..ba0ab3bed 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1626,54 +1626,106 @@ class SurveyAdminSettings {
 				
             // Preverimo ce je vklopljen modul za volitve - potem ne pustimo nobenih preklopov
             $voting_disabled = '';
-            $voting_disabled_class = '';
             if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
                 $voting_disabled = ' disabled';
-                $voting_disabled_class = ' class="gray"';
 
                 echo '<p class="red">'.$lang['srv_voting_warning_paradata'].'</p>';	
             }
 			
-			echo '<p>'.$lang['srv_metadata_desc'].'</p>';	
-				
-			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_browser'].':</label></span>';
-            echo ' <label for="survey_browser_1" '.$voting_disabled_class.'><input type="radio" name="survey_browser" id="survey_browser_1" value="1"'.($browser==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
-            echo ' <label for="survey_browser_0" '.$voting_disabled_class.'><input type="radio" name="survey_browser" id="survey_browser_0" value="0"'.($browser==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label><br class="clr"/>';
+			echo '<div class="setting_holder">';
+			echo '<p>'.$lang['srv_metadata_desc'].'</p>';
+			echo '</div>';
 			
-            echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_referal'].':</label></span>';
-            echo ' <label for="survey_referal_1" '.$voting_disabled_class.'><input type="radio" name="survey_referal" id="survey_referal_1" value="1"'.($referal==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
-            echo ' <label for="survey_referal_0" '.$voting_disabled_class.'><input type="radio" name="survey_referal" id="survey_referal_0" value="0"'.($referal==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label><br class="clr"/>';
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_sledenje_browser'].':</span>';
 			
-            echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_date'].':</label></span>';
-            echo ' <label for="survey_date_1" '.$voting_disabled_class.'><input type="radio" name="survey_date" id="survey_date_1" value="1"'.($date==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
-            echo ' <label for="survey_date_0" '.$voting_disabled_class.'><input type="radio" name="survey_date" id="survey_date_0" value="0"'.($date==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label><br class="clr"/>';
-	
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_browser" id="survey_browser_1" value="1"'.($browser==1?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_browser_1">'.$lang['no'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_browser" id="survey_browser_0" value="0"'.($browser==0?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_browser_0">'.$lang['yes'].'</label>';
+			echo '</div>';
+			
+			echo '</div>';
+
+			echo '<div class="setting_holder">';
+            echo '<span class="setting_title">'.$lang['srv_sledenje_referal'].':</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_referal" id="survey_referal_1" value="1"'.($referal==1?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_referal_1">'.$lang['no'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_referal" id="survey_referal_0" value="0"'.($referal==0?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_referal_0" >'.$lang['yes'].'</label>';
+			echo '</div>';
+			
+			echo '</div>';
+
+			echo '<div class="setting_holder">';
+            echo '<span class="setting_title">'.$lang['srv_sledenje_date'].':</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_date" id="survey_date_1" value="1"'.($date==1?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_date_1">'.$lang['no'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_date" id="survey_date_0" value="0"'.($date==0?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_date_0">'.$lang['yes'].'</label>';
+			echo '</div>';
+			
+			echo '</div>';
+
 			echo '</fieldset>';
 	
-	
-			echo '<br />';
-	
-	
 			echo '<fieldset>';
 
 			echo '<legend>'.$lang['srv_sledenje_ip_title'].'</legend>';
-			
-			echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_ip'].':</label></span>';
-            echo ' <label for="survey_ip_1" '.$voting_disabled_class.'><input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
-            echo ' <label for="survey_ip_0" '.$voting_disabled_class.'><input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label>';
-			
-            if($ip == 0 && $ip_show != 1)
-				echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_sledenje_ip_alert'].'</div>';
+
+			if($ip == 0 && $ip_show != 1) {
+				echo '<div class="setting_holder">';
+				echo '<p class="red">'.$lang['srv_sledenje_ip_alert'].'</p>';
+				echo '</div>';
+			}
 				
-			echo '<br class="clr"/>';
+
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_sledenje_ip'].':</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_ip_1">'.$lang['no'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_ip_0">'.$lang['yes'].'</label>';
+			echo '</div>';
+			
+			echo '</div>';
 			
 			if($ip == 0 && ($admin_type == 0 || $admin_type == 1)){
-				echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_show_ip'].':</label></span>';
-                echo ' <label for="survey_show_ip_0" '.$voting_disabled_class.'><input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
-                echo ' <label for="survey_show_ip_1" '.$voting_disabled_class.'><input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label>';
+
+				echo '<div class="setting_holder">';
+				echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.'>';
+                echo '<label for="survey_show_ip_0">'.$lang['no'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.'>';
+                echo '<label for="survey_show_ip_1">'.$lang['yes'].'</label>';
+				echo '</div>';
 				
-                if($ip_show == 1)
-					echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_show_ip_alert'].'</div>';
+				echo '</div>';
+
+                if($ip_show == 1) {
+				echo '<div class="setting_holder">';
+				echo '<p class="red">'.$lang['srv_show_ip_alert'].'</p>';
+				echo '</div>';
+				}	
 			}
 	
 			echo '</fieldset>';
@@ -1681,16 +1733,28 @@ class SurveyAdminSettings {
 			
 			// Povezovanje identifikatorjev s podatki - samo za admine in ce so vklopljena email vabila
 			if ($admin_type == 0 && SurveyInfo::getInstance()->checkSurveyModule('email')) {
-				echo '<br />';
-				echo '<fieldset class="wide">';
+				echo '<fieldset>';
 				echo '<legend>'.$lang['srv_sledenje_identifikatorji_title'].' '.Help::display('srv_email_with_data').'</legend>';
+
+				echo '<div class="setting_holder">';
+				echo '<span class="setting_title">'.$lang['srv_sledenje_identifikatorji'].':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="show_email" id="show_email_0" value="0"'.($row['show_email']==0?' checked':'').' '.$voting_disabled.'>';
+                echo '<label for="show_email_0">'.$lang['no'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="show_email" id="show_email_1" value="1"'.($row['show_email']==1?' checked':'').' '.$voting_disabled.'>';
+                echo '<label for="show_email_1">'.$lang['yes'].'</label>';
+				echo '</div>';
 				
-				echo '<span class="nastavitveSpan1 wide"><label>'.$lang['srv_sledenje_identifikatorji'].':</label></span>';
-                echo ' <label for="show_email_0" '.$voting_disabled_class.'><input type="radio" name="show_email" id="show_email_0" value="0"'.($row['show_email']==0?' checked':'').' '.$voting_disabled.'>'.$lang['no'].'</label>';
-                echo ' <label for="show_email_1" '.$voting_disabled_class.'><input type="radio" name="show_email" id="show_email_1" value="1"'.($row['show_email']==1?' checked':'').' '.$voting_disabled.'>'.$lang['yes'].'</label>';
+				echo '</div>';
 				
-                if($row['show_email'] == 1)
-					echo '<div class="spaceLeft floatRight red" style="display:inline; width:520px;">'.$lang['srv_show_mail_with_data3'].'</div>';
+                if($row['show_email'] == 1) {
+				echo '<div class="setting_holder">';
+				echo '<p class="red">'.$lang['srv_show_mail_with_data3'].'</p>';
+				echo '</div>';
+				}
 					
 				echo '</fieldset>';
 			}