diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index ce4a87bb9..408515aa9 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1140,41 +1140,56 @@ class SurveyAdminSettings {
 					$css_width2 = 'width:45% !important;';
 				}
 				
-				echo '<fieldset style="float: left;'.$css_width.'"><legend>'.$lang['comments'].'</legend>';
+				echo '<fieldset class="comments"><legend>'.$lang['comments'].'</legend>';
 
-				echo '<p><input type="checkbox" name="comments_default" id="comments_admin1" onclick="comments_admin_toggle(\'1\')" admin_on="false" /><label for="comments_admin1" style="font-weight:500; vertical-align:inherit"> '.$lang['srv_comments_admin_on1'].'</label><br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;('.$lang['srv_comments_admin_note1'].')</p>';
-				echo '<p><input type="checkbox" name="comments_resp2" id="comments_resp2" onclick="comments_resp_toggle(\'2\')" resp_on="false" /><label for="comments_resp2" style="font-weight:500; vertical-align:inherit"> '.$lang['srv_comments_resp_on2'].'</label><br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;('.$lang['srv_comments_resp_note2'].')</p>';		
-				echo '<p><input type="checkbox" name="comments_default" id="comments_admin2" onclick="comments_admin_toggle(\'2\')" admin_on="false" /><label for="comments_admin2" style="font-weight:500; vertical-align:inherit"> '.$lang['srv_comments_admin_on2'].'</label><br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;('.$lang['srv_comments_admin_note2'].')</p>';
-				echo '<p><input type="checkbox" name="comments_default" id="comments_resp" onclick="comments_resp_toggle(\'1\')" resp_on="false" /><label for="comments_resp" style="font-weight:500; vertical-align:inherit"> '.$lang['srv_comments_resp_on'].'</label><br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;('.$lang['srv_comments_resp_note'].')</p>';		
+				echo '<p class="semi-bold caps bottom16">'.$lang['srv_admin_s_comments_editor'].'</p>';
+				echo '<div class="setting_holder">';
+				echo '<input type="checkbox" name="comments_default" id="comments_admin1" onclick="comments_admin_toggle(\'1\')" admin_on="false" /><label class="semi-bold" for="comments_admin1"> '.$lang['srv_comments_admin_on1'].'</label>';
+				echo '<p class="indent">('.$lang['srv_comments_admin_note1'].')</p>';
+				echo '</div>';
+				echo '<div class="setting_holder">';
+				echo '<input type="checkbox" name="comments_default" id="comments_admin2" onclick="comments_admin_toggle(\'2\')" admin_on="false" /><label class="semi-bold" for="comments_admin2"> '.$lang['srv_comments_admin_on2'].'</label>';
+				echo '<p class="indent">('.$lang['srv_comments_admin_note2'].')</p>';
+				echo '</div>';
+
+				echo '<p class="semi-bold caps bottom16">'.$lang['srv_admin_s_comments_resp'].'</p>';
+				echo '<div class="setting_holder">';
+				echo '<input type="checkbox" name="comments_resp2" id="comments_resp2" onclick="comments_resp_toggle(\'2\')" resp_on="false" /><label class="semi-bold" for="comments_resp2"> '.$lang['srv_comments_resp_on2'].'</label>';
+				echo '<p class="indent">('.$lang['srv_comments_resp_note2'].')</p>';
+				echo '</div>';
+				echo '<div class="setting_holder">';
+				echo '<input type="checkbox" name="comments_default" id="comments_resp" onclick="comments_resp_toggle(\'1\')" resp_on="false" /><label class="semi-bold" for="comments_resp"> '.$lang['srv_comments_resp_on'].'</label>';
+				echo '<p class="indent">('.$lang['srv_comments_resp_note'].')</p>';
+				echo '</div>';
+
+				echo '<p class="semi-bold caps top16 bottom16">'.$lang['srv_admin_s_comments_links'].'</p>';
+
+				echo '<div class="links">';
 
-				//echo '<input type="radio" name="comments_defalut" id="comments_default_on" disabled /> <a href="#" onclick="comments_default_on(); return false;">'.$lang['srv_comments_default_on'].'</a><br />';
-				//echo '<input type="radio" name="comments_defalut" id="comments_on" disabled /> '.$lang['srv_comments_on'].'<br />';
-				//echo '<input type="radio" name="comments_defalut" id="comments_default_off" disabled /> <a href="#" onclick="comments_default_off(); return false;">'.$lang['srv_comments_default_off'].'</a>';
-				
 				$d = new Dostop();
 				
-				$sqlc = sisplet_query("SELECT COUNT(s.id) AS count FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='$this->anketa' AND s.gru_id=g.id AND s.thread > '0'");
+				/*$sqlc = sisplet_query("SELECT COUNT(s.id) AS count FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='$this->anketa' AND s.gru_id=g.id AND s.thread > '0'");
 				if (!$sqlc) echo mysqli_error($GLOBALS['connect_db']);
 				$rowc = mysqli_fetch_array($sqlc);
-				if ($rowc['count'] > 0 && $d->checkDostopSub('test')) {				
+				if ($rowc['count'] > 0 && $d->checkDostopSub('test')) {
+					
+					echo '<div class="button" title="'.$lang['srv_view_comment'].' onClick="window.location.href=\''.$site_url . 'admin/survey/index.php?anketa=' . $row['id'] .'&a=komentarji\';">';
+					echo '<span class="faicon comments"></span>';
+					echo $lang['srv_view_comment'];
+					echo '</div>';
+				}*/
 
-					echo '<p>';
-					echo '<a href="'.$site_url . 'admin/survey/index.php?anketa=' . $row['id'] .'&a=komentarji" title="' . $lang['srv_view_comment'] . '" >';
-					echo '<div class="fa-stack"><span class="faicon comments fa-stack-1x" icon-blue" title="'.$lang['srv_view_comment'].'"></span></div>';
-					echo '&nbsp;'.$lang['srv_view_comment'];
-					echo '</a>';
-				}
-				
-				echo '</p>';
+				echo '<div class="button" title="'.$lang['srv_view_comment'].'" onClick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=komentarji\';">';
+				echo '<span class="faicon comments_num blue"></span>';
+				echo $lang['srv_admin_s_comments_view'];
+				echo '</div>';
 
+				echo '<div class="button" onclick="$(\'#komentarji_napredno\').fadeToggle(); $(\'#komentarji_napredno_arrow\').toggleClass(\'plus\'); $(\'#komentarji_napredno_arrow\').toggleClass(\'minus\'); return false;">';
+				echo '<span id="komentarji_napredno_arrow" class="faicon plus blue"></span>';
+				echo $lang['srv_admin_s_comments_set'];
+				echo '</div>';
 				
-				echo '<p><a href="index.php?anketa='.$this->anketa.'&a=komentarji"><span class="bold">'.$lang['comments'].'</span></a></p>';
-				echo '<p><a href="index.php?anketa='.$this->anketa.'&a=vabila"><span class="bold">'.$lang['srv_vabila'].'</span></a></p>';
-				
-                echo '<p><a href="#" onclick="$(\'#komentarji_napredno\').fadeToggle(); $(\'#komentarji_napredno_arrow\').toggleClass(\'arrow2_d\'); $(\'#komentarji_napredno_arrow\').toggleClass(\'arrow2_u\'); return false;">';
-                echo '  <span class="bold">'.$lang['srv_detail_settings'].'&nbsp;</span>';
-                echo '  <span id="komentarji_napredno_arrow" class="faicon arrow2_d"></span>';
-                echo '</a></p>';
+				echo '</div>';
 				
 				echo '</fieldset>';
 				
@@ -1222,66 +1237,108 @@ class SurveyAdminSettings {
 				
 				if ($survey_comment != "") {
 					
-					echo '<fieldset style="float:right;margin-left:13px !important;margin-right:0px !important;'.$css_width2.'"><legend>'.$lang['srv_admin_s_comments'].'</legend>';
-					//echo '<form name="comment_send" action="ajax.php?a=comment_send&anketa='.$this->anketa.'">';
-					echo '<textarea name="comment_send" style="width:50%; height:60px"></textarea>';
-					
-					echo '<p><input type="checkbox" id="srv_c_alert" name="srv_c_alert" checked value="1" /><label for="srv_c_alert"> '.$lang['srv_c_alert'].'</label></p>';
-					echo '<p><input type="checkbox" id="srv_c_to_mail" name="srv_c_to_mail" value="1" onchange="$(\'#prejemniki\').toggle();" /><label for="srv_c_to_mail"> '.$lang['srv_c_to_mail'].'</label></p>';
-					
-					echo '<p id="prejemniki" style="display:none">';
+					echo '<fieldset class="comments" ><legend>'.$lang['srv_admin_s_comments'].'</legend>';
+					echo '<textarea name="comment_send"></textarea>';
+
+					echo '<div class="setting_holder">';
+					echo '<input type="checkbox" id="srv_c_alert" name="srv_c_alert" checked value="1" />';
+					echo '<label for="srv_c_alert"> '.$lang['srv_c_alert'].'</label>';
+					echo '</div>';
+					echo '<div class="setting_holder">';
+					echo '<input type="checkbox" id="srv_c_to_mail" name="srv_c_to_mail" value="1" onchange="$(\'#prejemniki\').toggle();" />';
+					echo '<label for="srv_c_to_mail"> '.$lang['srv_c_to_mail'].'</label>';
+
+					echo '<div id="prejemniki" style="display:none">';
 					$sqlp = sisplet_query("SELECT u.name, u.surname, u.email FROM srv_dostop d, users u WHERE d.uid=u.id AND ank_id='$this->anketa'");
 					while ($rowp = mysqli_fetch_array($sqlp)) {
-						echo '&nbsp;&nbsp;&nbsp;&nbsp; <input type="checkbox" name="mails[]" value="'.$rowp['email'].'" checked="checked" id="'.$rowp['email'].'" /><label for="'.$rowp['email'].'"> '.$rowp['name'].' '.$rowp['surname'].' ('.$rowp['email'].')</label><br />';
+
+						echo '<div class="setting_item indent">';
+						echo '<input type="checkbox" name="mails[]" value="'.$rowp['email'].'" checked="checked" id="'.$rowp['email'].'" />';
+						echo '<label for="'.$rowp['email'].'"> '.$rowp['name'].' '.$rowp['surname'].' ('.$rowp['email'].')</label>';
+						echo '</div>';
 					}
-					echo '</p>';
+					echo '</div>';
+					echo '</div>';
 					
-					echo '
-					<div class="buttonwrapper" style="float:left;">
-					<a class="ovalbutton ovalbutton_orange btn_savesettings" onclick="document.settingsanketa_'.$this->anketa.'.submit(); return false;" href="#">
-					'.$lang['add'].'
-					</a>
-					</div>';
-					//echo '</form>';
 					echo '</fieldset>';
-					echo '<br />';
-					
 				}
 				
-				echo '<div id="komentarji_napredno" '.($_GET['advanced_expanded']==1 ? '' : ' style="display:none;"').'>';
-				
-				echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;"><span>';
-				echo $lang['edit1337'] . '</span></a></div></span>';
-				
-				echo '<fieldset class="wide"><legend>'.$lang['srv_preview_defaults'].'</legend>';
-				
-				echo '<span class="nastavitveSpan1"><label for="disableif">'.$lang['srv_disableif'].': </span><input type="hidden" name="preview_disableif" value=""><input type="checkbox" value="1" '.($preview_disableif==1?' checked':'').' name="preview_disableif" id="disableif">';
-				echo ' </label><br>';
-				echo '<span class="nastavitveSpan1"><label for="disablealert">'.$lang['srv_disablealert'].': </span><input type="hidden" name="preview_disablealert" value=""><input type="checkbox" value="1" '.($preview_disablealert==1?' checked':'').' name="preview_disablealert" id="disablealert">';
-				echo ' </label><br>';
-				echo '<span class="nastavitveSpan1"><label for="displayifs">'.$lang['srv_displayifs'].': </span><input type="hidden" name="preview_displayifs" value=""><input type="checkbox" value="1" '.($preview_displayifs==1?' checked':'').' name="preview_displayifs" id="displayifs">';
-				echo ' </label><br>';
-				echo '<span class="nastavitveSpan1"><label for="displayvariables">'.$lang['srv_displayvariables'].': </span><input type="hidden" name="preview_displayvariables" value=""><input type="checkbox" value="1" '.($preview_displayvariables==1?' checked':'').' name="preview_displayvariables" id="displayvariables">';
-				echo ' </label><br>';		
-				echo '<span class="nastavitveSpan1"><label for="hidecomment">'.$lang['srv_preview_comments2'].': </span><input type="hidden" name="preview_hidecomment" value=""><input type="checkbox" value="1" '.($preview_hidecomment==1?' checked':'').' name="preview_hidecomment" id="hidecomment">';
-				echo ' </label><br>';
-				echo '<span class="nastavitveSpan1"><label for="hidesurveycomment">'.$lang['srv_preview_hide_survey_comment'].': </span><input type="hidden" name="preview_hide_survey_comment" value=""><input type="checkbox" value="1" '.($preview_hide_survey_comment==1?' checked':'').' name="preview_hide_survey_comment" id="hidesurveycomment">';
-				echo ' </label><br>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_preview_survey_comment_showalways'] . ':</label></span>';
-				echo '<label for="preview_survey_comment_showalways_0"><input type="radio" name="preview_survey_comment_showalways" value="0" id="preview_survey_comment_showalways_0" ' . ($preview_survey_comment_showalways == 0 ? ' checked' : '') . '/>' . $lang['no'] . '</label> ';
-				echo '<label for="preview_survey_comment_showalways_1"><input type="radio" name="preview_survey_comment_showalways" value="1" id="preview_survey_comment_showalways_1" ' . ($preview_survey_comment_showalways == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';			
-				echo '<br>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_preview_disable_test_insert'] . ':</label></span>';
-				echo '<label for="preview_disable_test_insert_1"><input type="radio" name="preview_disable_test_insert" value="1" id="preview_disable_test_insert_1" ' . ($preview_disable_test_insert == 1 ? ' checked' : '') . '/>' . $lang['no'] . '</label> ';			
-				echo '<label for="preview_disable_test_insert_0"><input type="radio" name="preview_disable_test_insert" value="0" id="preview_disable_test_insert_0" ' . ($preview_disable_test_insert == 0 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
-				echo '<br>';
-				
-				echo '</fieldset><br>';
-				
-				echo '<fieldset class="wide"><legend>'.$lang['srv_admin_s_comments'].'<span>'.$lang['srv_admin_s_comments_txt'].'</span></legend>';
+				//Komentarji - napredne nastavitve
+				echo '<div id="komentarji_napredno" '.($_GET['advanced_expanded']==1 ? '' : 'style="display:none"').'>';
 
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_write'] . ':</label></span>';
-				echo '<select name="survey_comment">';
+				echo '<div class="button_holder">';
+				echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';				
+				echo '<button class="medium blue" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'.$lang['edit1337'].'</button>';
+				echo '</div>';
+				
+				echo '<fieldset class="comments"><legend>'.$lang['srv_preview_defaults'].'</legend>';
+
+				echo '<div class="setting_holder">';
+
+				echo '<div class="setting_item top0">';
+				echo '<input type="hidden" name="preview_disableif" value=""><input type="checkbox" value="1" '.($preview_disableif==1?' checked':'').' name="preview_disableif" id="disableif">';
+				echo '<label for="disableif">'.$lang['srv_disableif'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="preview_disablealert" value=""><input type="checkbox" value="1" '.($preview_disablealert==1?' checked':'').' name="preview_disablealert" id="disablealert">';
+				echo '<label for="disablealert">'.$lang['srv_disablealert'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="preview_displayifs" value=""><input type="checkbox" value="1" '.($preview_displayifs==1?' checked':'').' name="preview_displayifs" id="displayifs">';
+				echo '<label for="displayifs">'.$lang['srv_displayifs'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="preview_displayvariables" value=""><input type="checkbox" value="1" '.($preview_displayvariables==1?' checked':'').' name="preview_displayvariables" id="displayvariables">';
+				echo '<label for="displayvariables">'.$lang['srv_displayvariables'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="preview_hidecomment" value=""><input type="checkbox" value="1" '.($preview_hidecomment==1?' checked':'').' name="preview_hidecomment" id="hidecomment">';
+				echo '<label for="hidecomment">'.$lang['srv_preview_comments2'].'</label>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="preview_hide_survey_comment" value=""><input type="checkbox" value="1" '.($preview_hide_survey_comment==1?' checked':'').' name="preview_hide_survey_comment" id="hidesurveycomment">';
+				echo '<label for="hidesurveycomment">'.$lang['srv_preview_hide_survey_comment'].'</label>';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_preview_survey_comment_showalways'] .':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="preview_survey_comment_showalways" value="0" id="preview_survey_comment_showalways_0" ' . ($preview_survey_comment_showalways == 0 ? ' checked' : '') . '/>';
+				echo '<label for="preview_survey_comment_showalways_0">' . $lang['no'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="preview_survey_comment_showalways" value="1" id="preview_survey_comment_showalways_1" ' . ($preview_survey_comment_showalways == 1 ? ' checked' : '') . '/>';
+				echo '<label for="preview_survey_comment_showalways_1">' . $lang['yes'] . '</label> ';			
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_preview_disable_test_insert'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="preview_disable_test_insert" value="1" id="preview_disable_test_insert_1" ' . ($preview_disable_test_insert == 1 ? ' checked' : '') . '/>';
+				echo '<label for="preview_disable_test_insert_1">' . $lang['no'] . '</label> ';			
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="preview_disable_test_insert" value="0" id="preview_disable_test_insert_0" ' . ($preview_disable_test_insert == 0 ? ' checked' : '') . '/>';
+				echo '<label for="preview_disable_test_insert_0">' . $lang['yes'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+				
+				echo '</fieldset>';
+				
+				echo '<fieldset class="comments"><legend>'.$lang['srv_admin_s_comments'].'<span>'.$lang['srv_admin_s_comments_txt'].'</span></legend>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_write'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="survey_comment">';
 				echo '<option value=""'.($survey_comment==''?' selected':'').'>'.$lang['srv_nihce'].'</option>';
 				//echo '<option value="4"'.($survey_comment==4?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($survey_comment==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
@@ -1289,51 +1346,90 @@ class SurveyAdminSettings {
 				echo '<option value="1" '.($survey_comment==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($survey_comment=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select>';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_view'] . ':</label></span>';
-				echo '<select name="survey_comment_viewadminonly">';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_view'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="survey_comment_viewadminonly">';
 				//echo '<option value="4"'.($survey_comment_viewadminonly==4?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($survey_comment_viewadminonly==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
 				echo '<option value="2" '.($survey_comment_viewadminonly==2 ?' selected':'').'>'.$lang['forum_clan'].'</option>';
 				echo '<option value="1" '.($survey_comment_viewadminonly==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($survey_comment_viewadminonly=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select> ';
-				echo $lang['srv_comments_viewauthor'];
-				echo '<input type="hidden" name="survey_comment_viewauthor" value=""><input type="checkbox" name="survey_comment_viewauthor" value="1" '.($survey_comment_viewauthor==1?' checked':'').' />';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_survey_comment_show'] . ':</label></span>';
-				echo '<label for="survey_comment_showalways_0"><input type="radio" name="survey_comment_showalways" value="0" id="survey_comment_showalways_0" ' . ($survey_comment_showalways == 0 ? ' checked' : '') . '/>' . $lang['no'] . '</label> ';
-				echo '<label for="survey_comment_showalways_1"><input type="radio" name="survey_comment_showalways" value="1" id="survey_comment_showalways_1" ' . ($survey_comment_showalways == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="survey_comment_viewauthor" value=""><input type="checkbox" id="survey_comment_viewauthor" name="survey_comment_viewauthor" value="1" '.($survey_comment_viewauthor==1?' checked':'').' />';
+				echo '<label for="survey_comment_viewauthor">'.$lang['srv_comments_viewauthor'].'</label>';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_survey_comment_show'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="survey_comment_showalways" value="0" id="survey_comment_showalways_0" ' . ($survey_comment_showalways == 0 ? ' checked' : '') . '/>';
+				echo '<label for="survey_comment_showalways_0">' . $lang['no'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="survey_comment_showalways" value="1" id="survey_comment_showalways_1" ' . ($survey_comment_showalways == 1 ? ' checked' : '') . '/>';
+				echo '<label for="survey_comment_showalways_1">' . $lang['yes'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
 				echo '</fieldset>';
-				echo '<br>';
 				
-				echo '<fieldset class="wide">';
+				echo '<fieldset class="comments">';
 				echo '<legend>' . $lang['srv_admin_q_notes'] . '<span>'.$lang['srv_admin_q_notes_txt'].'</span></legend>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_q_note_view'] . ':</label></span>';
-				echo '<select name="question_note_view">';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_q_note_view'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="question_note_view">';
 				echo '<option value=""'.($question_note_view==''?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($question_note_view==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
 				echo '<option value="2" '.($question_note_view==2 ?' selected':'').'>'.$lang['forum_clan'].'</option>';
 				echo '<option value="1" '.($question_note_view==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($question_note_view=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select>';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_q_note_write'] . ':</label></span>';
-				echo '<select name="question_note_write">';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_q_note_write'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="question_note_write">';
 				echo '<option value=""'.($question_note_write==''?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($question_note_write==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
 				echo '<option value="2" '.($question_note_write==2 ?' selected':'').'>'.$lang['forum_clan'].'</option>';
 				echo '<option value="1" '.($question_note_write==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($question_note_write=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
-				echo '</select> ';
+				echo '</select>';
+				echo '</div>';
+							
+				echo '</div>';
+				
 				echo '</fieldset>';
-				echo '<br>';
 			
 			
-				echo '<fieldset class="wide">';
+				echo '<fieldset class="comments">';
 				echo '<legend>' . $lang['srv_admin_q_comments'] . '<span>'.$lang['srv_admin_q_comments_txt'].'</span></legend>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_write'] . ':</label></span>';
-				echo '<select name="question_comment">';
+
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_write'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="question_comment">';
 				echo '<option value=""'.($question_comment==''?' selected':'').'>'.$lang['srv_nihce'].'</option>';
 				echo '<option value="4"'.($question_comment==4?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($question_comment==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
@@ -1341,30 +1437,55 @@ class SurveyAdminSettings {
 				echo '<option value="1" '.($question_comment==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($question_comment=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select>';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_view'] . ':</label></span>';
-				echo '<select name="question_comment_viewadminonly">';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_view'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="question_comment_viewadminonly">';
 				echo '<option value="4"'.($question_comment_viewadminonly==4 || $question_comment_viewadminonly==''?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($question_comment_viewadminonly==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
 				echo '<option value="2" '.($question_comment_viewadminonly==2 ?' selected':'').'>'.$lang['forum_clan'].'</option>';
 				echo '<option value="1" '.($question_comment_viewadminonly==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($question_comment_viewadminonly=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
-				echo '</select> ';
-				echo $lang['srv_comments_viewauthor'];
-				echo '<input type="hidden" name="question_comment_viewauthor" value=""><input type="checkbox" name="question_comment_viewauthor" value="1" '.($question_comment_viewauthor==1?' checked':'').' />';
-				echo '</fieldset>';
-				echo '<br>';
-				
+				echo '</select>';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="question_comment_viewauthor" value=""><input type="checkbox" id="question_comment_viewauthor" value="1" '.($question_comment_viewauthor==1?' checked':'').' />';
+				echo '<label for="question_comment_viewauthor">'.$lang['srv_comments_viewauthor'].'</label>';
+				echo '</div>';
+							
+				echo '</div>';
 
-				echo '<fieldset class="wide">';
-				echo '<legend>' . $lang['srv_comments_respondents'] . '<span>'.$lang['srv_comments_respondents_txt'].'</span></legend>';
-				
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_q_comment'] . ':</label></span>';
-				echo '<label for="question_resp_comment_0"><input type="radio" name="question_resp_comment" value="0" id="question_resp_comment_0" ' . ($question_resp_comment == 0 ? ' checked' : '') . '/>' . $lang['no'] . '</label> ';
-				echo '<label for="question_resp_comment_1"><input type="radio" name="question_resp_comment" value="1" id="question_resp_comment_1" ' . ($question_resp_comment == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_view'] . ':</label></span>';
-				echo '<select name="question_resp_comment_viewadminonly">';
+				echo '</fieldset>';
+
+				echo '<fieldset class="comments">';
+				echo '<legend>' . $lang['srv_comments_respondents'] . '</legend>';
+
+				echo '<p class="bottom16">'.$lang['srv_comments_respondents_txt'].'</p>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_q_comment'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment" value="0" id="question_resp_comment_0" ' . ($question_resp_comment == 0 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_0">' . $lang['no'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment" value="1" id="question_resp_comment_1" ' . ($question_resp_comment == 1 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_1">' . $lang['yes'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_view'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="question_resp_comment_viewadminonly">';
 				//echo '<option value=""'.($question_resp_comment_viewadminonly==''?' selected':'').'>'.$lang['srv_nihce'].'</option>';
 				echo '<option value="4"'.($question_resp_comment_viewadminonly==4 || $question_resp_comment_viewadminonly==''?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($question_resp_comment_viewadminonly==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
@@ -1372,38 +1493,41 @@ class SurveyAdminSettings {
 				echo '<option value="1" '.($question_resp_comment_viewadminonly==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($question_resp_comment_viewadminonly=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select>';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_show_open'] . ':</label></span>';
-				echo '<label for="question_resp_comment_show_open_0"><input type="radio" name="question_resp_comment_show_open" value="" id="question_resp_comment_show_open_0" ' . ($question_resp_comment_show_open == '' ? ' checked' : '') . '/>' . $lang['forma_settings_open'] . '</label> ';
-				echo '<label for="question_resp_comment_show_open_1"><input type="radio" name="question_resp_comment_show_open" value="1" id="question_resp_comment_show_open_1" ' . ($question_resp_comment_show_open == '1' ? ' checked' : '') . '/>' . $lang['forma_settings_closed'] . '</label> ';
-				echo '<br>';
-				echo '<span class="nastavitveSpan1"><label>' .$lang['text'].' "'. $lang['srv_question_respondent_comment'] . '":</label></span>';
-				echo '<input type="text" name="srvlang_srv_question_respondent_comment" value="'.$srvlang_srv_question_respondent_comment.'" style="width:300px">';
-				echo '<input type="hidden" name="extra_translations" value="1">';
-				echo '</fieldset>';
-				echo '<br>';
-				
-				echo '<fieldset class="wide">';
-				echo '<legend>' . $lang['srv_comments_respondents'] . '<span> - '.$lang['srv_extra_settings'].'</span></legend>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_q_inicialke'] . ':</label></span>';
-				echo '<label for="question_resp_comment_inicialke_0"><input type="radio" name="question_resp_comment_inicialke" value="0" id="question_resp_comment_inicialke_0" ' . ($question_resp_comment_inicialke == 0 ? ' checked' : '') . '/>' . $lang['no'] . '</label> ';
-				echo '<label for="question_resp_comment_inicialke_1"><input type="radio" name="question_resp_comment_inicialke" value="1" id="question_resp_comment_inicialke_1" ' . ($question_resp_comment_inicialke == 1 ? ' checked' : '') . '/>' . $lang['yes'] . '</label> ';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_q_inicialke_alert'] . ':</label></span>';
-				echo '<label for="question_resp_comment_inicialke_alert_0"><input type="radio" name="question_resp_comment_inicialke_alert" value="0" id="question_resp_comment_inicialke_alert_0" ' . ($question_resp_comment_inicialke_alert == 0 ? ' checked' : '') . '/>' . $lang['srv_reminder_off2'] . '</label> ';
-				echo '<label for="question_resp_comment_inicialke_alert_1"><input type="radio" name="question_resp_comment_inicialke_alert" value="1" id="question_resp_comment_inicialke_alert_1" ' . ($question_resp_comment_inicialke_alert == 1 ? ' checked' : '') . '/>' . $lang['srv_reminder_soft2'] . '</label> ';
-				echo '<label for="question_resp_comment_inicialke_alert_2"><input type="radio" name="question_resp_comment_inicialke_alert" value="2" id="question_resp_comment_inicialke_alert_2" ' . ($question_resp_comment_inicialke_alert == 2 ? ' checked' : '') . '/>' . $lang['srv_reminder_hard2'] . '</label> ';
-				/*echo '<br/>';
-				echo '<div class="nastavitveSpan1" style="height:auto; float:left;"><label>' . $lang['text'] . ':</label></div>';
-				echo '<textarea id="sys_survey_misc_question_comment_text" name="question_comment_text" type="text" srv_survey_misc="true" maxlength="255">'.$srv_qct.'</textarea>';
-				echo '&nbsp;<span id="sys_survey_misc_question_comment_text_chars">' . strlen($srv_qct) . '/250</span>' . "\n\r";*/
-				echo '</fieldset>';
-				echo '<br>';
-				
-				echo '<fieldset class="wide"><legend>'.$lang['srv_comments_respondents'].'<span>'.$lang['srv_resp_s_comments_txt'].'</span></legend>';
+				echo '</div>';
+							
+				echo '</div>';
 
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_write'] . ':</label></span>';
-				echo '<select name="survey_comment_resp">';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_show_open'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_show_open" value="" id="question_resp_comment_show_open_0" ' . ($question_resp_comment_show_open == '' ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_show_open_0">' . $lang['forma_settings_open'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_show_open" value="1" id="question_resp_comment_show_open_1" ' . ($question_resp_comment_show_open == '1' ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_show_open_1">' . $lang['forma_settings_closed'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' .$lang['text'].' "'. $lang['srv_question_respondent_comment'] . '":</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="text" class="text small" name="srvlang_srv_question_respondent_comment" value="'.$srvlang_srv_question_respondent_comment.'" style="width:300px">';
+				echo '<input type="hidden" name="extra_translations" value="1">';echo '</div>';
+							
+				echo '</div>';
+
+				echo '<p class="bottom16">'.$lang['srv_resp_s_comments_txt'].'</p>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_write'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="survey_comment_resp">';
 				echo '<option value=""'.($survey_comment_resp==''?' selected':'').'>'.$lang['srv_nihce'].'</option>';
 				echo '<option value="4"'.($survey_comment_resp==4?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($survey_comment_resp==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
@@ -1411,56 +1535,140 @@ class SurveyAdminSettings {
 				echo '<option value="1" '.($survey_comment_resp==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($survey_comment_resp=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select>';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_view'] . ':</label></span>';
-				echo '<select name="survey_comment_viewadminonly_resp">';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_view'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" nname="survey_comment_viewadminonly_resp">';
 				echo '<option value="4"'.($survey_comment_viewadminonly_resp==4?' selected':'').'>'.$lang['move_all'].'</option>';
 				echo '<option value="3" '.($survey_comment_viewadminonly_resp==3 ?' selected':'').'>'.$lang['forum_registered'].'</option>';
 				echo '<option value="2" '.($survey_comment_viewadminonly_resp==2 ?' selected':'').'>'.$lang['forum_clan'].'</option>';
 				echo '<option value="1" '.($survey_comment_viewadminonly_resp==1 ?' selected':'').'>'.$lang['forum_manager'].'</option>';
 				echo '<option value="0" '.($survey_comment_viewadminonly_resp=='0' ?' selected':'').'>'.$lang['forum_admin'].'</option>';
 				echo '</select> ';
-				echo $lang['srv_comments_viewauthor'];
-				echo '<input type="hidden" name="survey_comment_viewauthor_resp" value=""><input type="checkbox" name="survey_comment_viewauthor_resp" value="1" '.($survey_comment_viewauthor_resp==1?' checked':'').' />';
-				/*echo '<br />';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_survey_comment_show'] . ':</label></span>';
-				echo '<input type="radio" name="survey_comment_showalways_resp" value="0" id="survey_comment_showalways_resp_0" ' . ($survey_comment_showalways_resp == 0 ? ' checked' : '') . '/><label for="survey_comment_showalways_resp_0">' . $lang['no'] . '</label> ';
-				echo '<input type="radio" name="survey_comment_showalways_resp" value="1" id="survey_comment_showalways_resp_1" ' . ($survey_comment_showalways_resp == 1 ? ' checked' : '') . '/><label for="survey_comment_showalways_resp_1">' . $lang['yes'] . '</label> ';
-				*/
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="hidden" name="survey_comment_viewauthor_resp" value=""><input type="checkbox" id="survey_comment_viewauthor_resp" name="survey_comment_viewauthor_resp" value="1" '.($survey_comment_viewauthor_resp==1?' checked':'').' />';
+				echo '<label for="survey_comment_viewauthor_resp">'.$lang['srv_comments_viewauthor'].'</label>';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<p class="semi-bold bottom16">'.$lang['srv_extra_settings'].'</p>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_q_inicialke'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_inicialke" value="0" id="question_resp_comment_inicialke_0" ' . ($question_resp_comment_inicialke == 0 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_inicialke_0">' . $lang['no'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_inicialke" value="1" id="question_resp_comment_inicialke_1" ' . ($question_resp_comment_inicialke == 1 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_inicialke_1">' . $lang['yes'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_q_inicialke_alert'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="0" id="question_resp_comment_inicialke_alert_0" ' . ($question_resp_comment_inicialke_alert == 0 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_inicialke_alert_0">' . $lang['srv_reminder_off2'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="1" id="question_resp_comment_inicialke_alert_1" ' . ($question_resp_comment_inicialke_alert == 1 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_inicialke_alert_1">' . $lang['srv_reminder_soft2'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="question_resp_comment_inicialke_alert" value="2" id="question_resp_comment_inicialke_alert_2" ' . ($question_resp_comment_inicialke_alert == 2 ? ' checked' : '') . '/>';
+				echo '<label for="question_resp_comment_inicialke_alert_2">' . $lang['srv_reminder_hard2'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
 				echo '</fieldset>';
-				echo '<br />';
 				
-				echo '<fieldset class="wide">';
+				echo '<fieldset class="comments">';
 				echo '<legend>' . $lang['srv_settings_komentarji'] . '</legend>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['orderby'] . ':</label></span>';
-				echo '<label for="sortpostorder_0"><input type="radio" name="sortpostorder" value="0" id="sortpostorder_0" ' . ($sortpostorder == 0 ? ' checked' : '') . '/>' . $lang['forum_asc'] . '</label> ';
-				echo '<label for="sortpostorder_1"><input type="radio" name="sortpostorder" value="1" id="sortpostorder_1" ' . ($sortpostorder == 1 ? ' checked' : '') . '/>' . $lang['forum_desc'] . '</label> ';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_add_comment'] . ':</label></span>';
-				echo '<label for="addfieldposition_0"><input type="radio" name="addfieldposition" value="0" id="addfieldposition_0" ' . ($addfieldposition == 0 ? ' checked' : '') . '/>' . $lang['srv_polozaj_bottom'] . '</label> ';
-				echo '<label for="addfieldposition_1"><input type="radio" name="addfieldposition" value="1" id="addfieldposition_1" ' . ($addfieldposition == 1 ? ' checked' : '') . '/>' . $lang['srv_polozaj_top'] . '</label> ';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_marks'] . ':</label></span>';
-				echo '<label for="commentmarks_0"><input type="radio" name="commentmarks" value="0" id="commentmarks_0" ' . ($commentmarks == 0 ? ' checked' : '') . '/>' . $lang['srv_comments_marks_0'] . '</label> ';
-				echo '<label for="commentmarks_1"><input type="radio" name="commentmarks" value="1" id="commentmarks_1" ' . ($commentmarks == 1 ? ' checked' : '') . '/>' . $lang['srv_comments_marks_1'] . '</label> ';
-				echo '<br/>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comments_marks_who'] . ':</label></span>';
-				echo '<label for="commentmarks_who_0"><input type="radio" name="commentmarks_who" value="0" id="commentmarks_who_0" ' . ($commentmarks_who == 0 ? ' checked' : '') . '/>' . $lang['srv_comments_marks_who_1'] . '</label> ';
-				echo '<label for="commentmarks_who_1"><input type="radio" name="commentmarks_who" value="1" id="commentmarks_who_1" ' . ($commentmarks_who == 1 ? ' checked' : '') . '/>' . $lang['srv_comments_marks_who_0'] . '</label> ';			
-				echo '<br>';
-				echo '<span class="nastavitveSpan1"><label>' . $lang['srv_comment_history'] . ':</label></span>';
-				echo '<select name="comment_history">';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['orderby'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="sortpostorder" value="0" id="sortpostorder_0" ' . ($sortpostorder == 0 ? ' checked' : '') . '/>';
+				echo '<label for="sortpostorder_0">' . $lang['forum_asc'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="sortpostorder" value="1" id="sortpostorder_1" ' . ($sortpostorder == 1 ? ' checked' : '') . '/>';
+				echo '<label for="sortpostorder_1">' . $lang['forum_desc'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_add_comment'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="addfieldposition" value="0" id="addfieldposition_0" ' . ($addfieldposition == 0 ? ' checked' : '') . '/>';
+				echo '<label for="addfieldposition_0">' . $lang['srv_polozaj_bottom'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="addfieldposition" value="1" id="addfieldposition_1" ' . ($addfieldposition == 1 ? ' checked' : '') . '/>';
+				echo '<label for="addfieldposition_1">' . $lang['srv_polozaj_top'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_marks'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="commentmarks" value="0" id="commentmarks_0" ' . ($commentmarks == 0 ? ' checked' : '') . '/>';
+				echo '<label for="commentmarks_0">' . $lang['srv_comments_marks_0'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="commentmarks" value="1" id="commentmarks_1" ' . ($commentmarks == 1 ? ' checked' : '') . '/>';
+				echo '<label for="commentmarks_1">' . $lang['srv_comments_marks_1'] . '</label> ';
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comments_marks_who'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="commentmarks_who" value="0" id="commentmarks_who_0" ' . ($commentmarks_who == 0 ? ' checked' : '') . '/>';
+				echo '<label for="commentmarks_who_0">' . $lang['srv_comments_marks_who_1'] . '</label> ';
+				echo '</div>';
+				echo '<div class="setting_item">';
+				echo '<input type="radio" name="commentmarks_who" value="1" id="commentmarks_who_1" ' . ($commentmarks_who == 1 ? ' checked' : '') . '/>';
+				echo '<label for="commentmarks_who_1">' . $lang['srv_comments_marks_who_0'] . '</label> ';			
+				echo '</div>';
+							
+				echo '</div>';
+
+				echo '<div class="setting_holder horizontal">';
+				echo '<span class="setting_title">' . $lang['srv_comment_history'] . ':</span>';
+
+				echo '<div class="setting_item">';
+				echo '<select class="dropdown small" name="comment_history">';
 				echo '<option value="0" '.($comment_history=='0' || $comment_history=='' ? ' selected':'').'>'.$lang['srv_comment_history_1'].'</option>';
 				echo '<option value="1" '.($comment_history==1 ?' selected':'').'>'.$lang['srv_comment_history_0'].'</option>';
 				echo '<option value="2" '.($comment_history==2 ?' selected':'').'>'.$lang['srv_comment_history_2'].'</option>';
 				echo '</select>';
-				echo '<br/>';
+				echo '</div>';
+							
+				echo '</div>';
+
 				echo '</fieldset>';
 				
-				echo '<br />';
-				echo '<fieldset><legend>' . $lang['srv_delete_comments'] . '</legend>';
-				echo '<p><a href="#" onClick="delete_test_data();">'.$lang['srv_delete_comments3'].'</a> ('.$lang['srv_delete_comments_txt2'].')</p>';
-				echo '</fieldset>';
+				echo '<p class="top16 bottom32"><a class="noline" href="#" onClick="delete_test_data();"><span class="faicon trash empty link-right"></span>'.$lang['srv_delete_comments3'].'</a> ('.$lang['srv_delete_comments_txt2'].')</p>';
 				
 				echo '</div>';	
 
@@ -9028,7 +9236,7 @@ class SurveyAdminSettings {
 		global $lang;
 		global $admin_type;
 
-		echo '<table id="all_users_list" class="dataTable">';
+		echo '<table id="all_users_list" class="usersTable">';
         
         echo '<thead><tr>';
         echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
@@ -9043,12 +9251,12 @@ class SurveyAdminSettings {
         echo '<th>' . $lang['users_gdpr_title'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
         echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';
-        echo '<th style="max-width: 70px;">'.$lang['edit2'].'</th>';
+        echo '<th>'.$lang['edit2'].'</th>';
         echo '</tr></thead>';
         
         echo '</table>';
         
-        // Dodajanje uporabnikov
+        /*/ Dodajanje uporabnikov
         echo '<div class="add_user">';
 
         // Admin lahko doda novega uporabnika v sistem (brez pregleda)
@@ -9058,7 +9266,7 @@ class SurveyAdminSettings {
             echo '</fieldset>';
         }
 
-        echo '</div>';
+        echo '</div>';*/
     }
     
     /**
@@ -9093,7 +9301,7 @@ class SurveyAdminSettings {
         // Tabela
         echo '<fieldset style="max-width: 100% !important;"><legend>'.$lang['srv_users_assigned_title'].'</legend>';
         //echo '<h4 style="margin-bottom: 10px;">'.$lang['srv_users_assigned_title'].'</h4>';
-        echo '<table id="my_users_list" class="dataTable">';
+        echo '<table id="my_users_list" class="usersTable">';
 
         echo '<thead><tr>';
         echo '<th>' . $lang['srv_survey_list_users_name'] . '</th>';
@@ -9130,7 +9338,7 @@ class SurveyAdminSettings {
 	public function deletedUsersList(){
 	    global  $lang; 
 
-	    	echo '<table id="deleted_users_list" class="dataTable">';
+	    	echo '<table id="deleted_users_list" class="usersTable">';
                 echo '<thead><tr>';
                     echo '<th>'.$lang['srv_survey_list_users_name'].'</th>';
                     echo '<th>'.$lang['srv_survey_list_users_email'].'</th>';
@@ -9149,7 +9357,7 @@ class SurveyAdminSettings {
     public function unsignedUsersList(){
 	    global  $lang;
 
-	    echo '<table id="unsigned_users_list" class="dataTable">';
+	    echo '<table id="unsigned_users_list" class="usersTable">';
 	    echo '<thead><tr>';
 	    echo '<th>'.$lang['srv_survey_list_users_name'].'</th>';
 	    echo '<th>'.$lang['srv_survey_list_users_email'].'</th>';
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index 0cb3bb479..2fd1bf322 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -517,7 +517,7 @@ class CrossRoad {
 
                     // Uporabniki
                     if($_GET['t'] == 'uporabniki'){
-                        $layout_width = 'wide';  
+                        $layout_width = 'fullwidth';  
                     }
                     // Ativnost
                     else{
diff --git a/lang/1.php b/lang/1.php
index 44d8f9a76..a8db5a3f2 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3587,12 +3587,17 @@ $lang = array (
 	"srv_admin_q_comments"			=>	"Komentarji na vpra&#353;anja",
 	"srv_admin_q_comments_txt"		=>	" – obla&#269;ek za komentarje urednikov na vsako vpra&#353;anje posebej (spodaj pod vsakim vpra&#353;anjem)",
 	"srv_admin_s_comments"			=>	"Komentarji na anketo",
+	"srv_admin_s_comments_editor"	=>	"Uredniki",
+	"srv_admin_s_comments_resp"		=>	"Respondenti",
+	"srv_admin_s_comments_links"	=>	"Povezave",
+	"srv_admin_s_comments_view"		=>	"Pregled vseh komentarjev",
+	"srv_admin_s_comments_set"		=>	"Pokaži napredne nastavitve",
 	"srv_admin_s_comments2"			=>	"Komentarji na anketo",
 	"srv_admin_s_comments_txt"		=>	" – obla&#269;ek za komentarje urednikov na anketo (zgoraj desno pri vpra&#353;alniku)",
-	"srv_resp_s_comments_txt"		=>	" – obla&#269;ek za komentarje respondentov na anketo (zgoraj desno pri vpra&#353;alniku)",
+	"srv_resp_s_comments_txt"		=>	"<span class=\"semi-bold\">Oblaček za komentarje respondentov na anketo</span> (zgoraj desno pri vprašalniku)",
 	"srv_comments_only_admin"			=>	"Vpisane komentarje vidijo samo administratorji",
 	"srv_comments_respondents"			=>	"Komentarji respondentov",
-	"srv_comments_respondents_txt"		=>	" – dodatno okno, ki se za vsako vpra&#353;anje prika&#382;e respondentom, ki ob odgovarjanju lahko podajo &#353;e svoj vtis oziroma komentar. Uredniki ankete vidijo te komentarje spodaj desno pod vsebino vpra&#353;anja",
+	"srv_comments_respondents_txt"		=>	"<span class=\"semi-bold\">Dodatno okno</span>, ki se za vsako vpra&#353;anje prika&#382;e respondentom, ki ob odgovarjanju lahko podajo &#353;e svoj vtis oziroma komentar. Uredniki ankete vidijo te komentarje spodaj desno pod vsebino vpra&#353;anja",
 	"srv_comments_show_open"			=>	"Okno za komentar naj bo na začetku",
 	"srv_comment_history"			=>	"Prikaz zgodovine splošnih komentarjev",
 	"srv_comment_history_0"			=>	"Brez",
diff --git a/lang/2.php b/lang/2.php
index cc871c459..958da1335 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -3556,12 +3556,17 @@ $lang = array (
 	"srv_admin_q_comments"			=>	"Question comments",
 	"srv_admin_q_comments_txt"		=>	" – pop-up window for editors comments on each survey question (below each question) ",
 	"srv_admin_s_comments"			=>	"Survey comments",
+	"srv_admin_s_comments_editor"	=>	"Editors",
+	"srv_admin_s_comments_resp"		=>	"Respondents",
+	"srv_admin_s_comments_links"	=>	"Links",
+	"srv_admin_s_comments_view"		=>	"View all comments",
+	"srv_admin_s_comments_set"		=>	"Show advanced settings",
 	"srv_admin_s_comments2"			=>	"View / add survey comments",
 	"srv_admin_s_comments_txt"		=>	" – pop-up window for editor comments on survey (upper right part of questionnaire)",
-	"srv_resp_s_comments_txt"		=>	" – pop-up window for respondent comments for the survey (upper right part of questionnaire)",
+	"srv_resp_s_comments_txt"		=>	"<span class=\"semi-bold\">Pop-up window for respondent comments for the survey</span> (upper right part of questionnaire)",
 	"srv_comments_only_admin"		=>	"Only administrators can view comments",
 	"srv_comments_respondents"		=>	"Comments of respondents",
-	"srv_comments_respondents_txt"	=>	" – additional text-box below each question for comments by respondents. Survey editors see these comments below the content of the question.",
+	"srv_comments_respondents_txt"	=>	"<span class=\"semi-bold\">Additional text-box</span> below each question for comments by respondents. Survey editors see these comments below the content of the question.",
 	"srv_comments_show_open"		=>	"At the start, the comment field should be",
 	"srv_comment_history"			=>	"Show survey comment history",
 	"srv_comment_history_0"			=>	"None",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f32004e16..93ab9fbff 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5071,6 +5071,9 @@ p.top16, span.top16 {
 p.top32, span.top32 {
   margin-top: 32px;
 }
+p.bottom32, span.bottom32 {
+  margin-bottom: 32px;
+}
 p.bottom8, span.bottom8 {
   margin-bottom: 8px;
 }
@@ -5652,7 +5655,6 @@ span.faicon.comments_empty::before {
 }
 
 span.faicon.comments_num::before {
-  font-size: 24px;
   content: "\f27a";
 }
 
@@ -11259,6 +11261,69 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   display: none;
 }
 
+fieldset.comments legend span {
+  font-size: 14px;
+  text-transform: none;
+  color: #333333;
+  font-weight: 400;
+}
+fieldset.comments p.indent {
+  margin-left: 26px;
+}
+fieldset.comments div.indent {
+  margin-left: 29px;
+}
+fieldset.comments div.links {
+  display: flex;
+  flex-direction: row;
+}
+fieldset.comments div.links div.button {
+  border: 1px solid #E5E5E5;
+  box-sizing: border-box;
+  padding: 5px 16px;
+  font-size: 14px;
+  margin-right: 16px;
+  cursor: pointer;
+}
+fieldset.comments div.links div.button.blue {
+  border-color: #1E88E5;
+}
+fieldset.comments div.links div.button span.faicon {
+  font-size: 14px;
+  margin-right: 8px;
+}
+fieldset.comments textarea {
+  width: 587px;
+  height: 174px;
+  margin-bottom: 16px;
+}
+fieldset.comments .top0 {
+  margin-top: 0;
+}
+fieldset.comments div.setting_holder.horizontal {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+fieldset.comments div.setting_holder.horizontal .setting_title {
+  margin-right: 20px;
+}
+fieldset.comments div.setting_holder.horizontal .setting_item {
+  margin-top: 0;
+}
+fieldset.comments div.setting_holder.horizontal .setting_item .dropdown {
+  margin-top: 0;
+  margin-right: 32px;
+  width: 210px;
+}
+fieldset.comments div.setting_holder.horizontal .setting_item input {
+  margin-top: 0;
+}
+
+div#komentarji_napredno fieldset:last-of-type {
+  margin-bottom: 0;
+}
+
 .dashboard_top_settings {
   display: flex;
   align-items: center;
@@ -21651,6 +21716,86 @@ table#timinganketa_table td input {
   font-size: 14px;
 }
 
+div.subpage_uporabniki .data_table_top_holder {
+  position: relative;
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+  box-sizing: border-box;
+  margin: 0 14px 16px 14px;
+  padding: 6px 16px;
+  background: #F8F8F8;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  font-size: 14px !important;
+}
+div.subpage_uporabniki .data_table_top_holder .osnova {
+  box-sizing: border-box;
+  padding-right: 8px;
+  margin-right: 8px;
+  border-right: 1px solid #C4C4C4;
+  display: flex;
+  align-items: center;
+}
+div.subpage_uporabniki .data_table_top_holder .osnova.no_border {
+  border: none;
+}
+div.subpage_uporabniki .data_table_top_holder .osnova select,
+div.subpage_uporabniki .data_table_top_holder .osnova input {
+  padding: 3px 5px;
+  margin: 0 0 0 8px;
+  width: 123px;
+  vertical-align: middle;
+}
+div.subpage_uporabniki .data_table_top_holder .dataSettingsBasic {
+  display: flex;
+  margin-right: 8px;
+  padding-right: 8px;
+  border: none;
+}
+div.subpage_uporabniki .data_table_top_holder .dataSettingsBasic button.white-blue {
+  height: 28px;
+  width: 140px;
+  min-width: auto;
+  padding: 0;
+  line-height: 12px;
+  font-weight: 400;
+  color: #333333;
+  border-radius: 2px;
+}
+div.subpage_uporabniki .data_table_top_holder .dataSettingsBasic button.white-blue.border_blue {
+  border-color: #1E88E5;
+}
+div.subpage_uporabniki .data_table_top_holder .dataSettingsBasic button.white-blue .faicon:before {
+  margin-right: 8px;
+  font-size: 12px;
+  color: #1E88E5;
+}
+div.subpage_uporabniki .data_table_top_holder #end {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+}
+div.subpage_uporabniki table.usersTable {
+  margin-left: 14px;
+  margin-right: 14px;
+  width: calc(100% - 28px);
+  white-space: nowrap;
+}
+div.subpage_uporabniki table.usersTable thead th,
+div.subpage_uporabniki table.usersTable tbody th {
+  font-weight: 600;
+  background-color: #F8F8F8;
+}
+div.subpage_uporabniki table.usersTable thead td,
+div.subpage_uporabniki table.usersTable thead th,
+div.subpage_uporabniki table.usersTable tbody td,
+div.subpage_uporabniki table.usersTable tbody th {
+  padding: 8px 16px;
+  border-top: 1px solid #E5E5E5;
+  vertical-align: middle;
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index dd3287206..41f8e7a2d 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -257,7 +257,6 @@ span.faicon.comments_empty::before{
     content: "\f27a";
 }
 span.faicon.comments_num::before{
-        font-size: 24px;
         content: "\f27a";
 }
 span.faicon.comments_num {
diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss
index 826676777..518ea4292 100644
--- a/resources/sass/admin_new/basic/typography.scss
+++ b/resources/sass/admin_new/basic/typography.scss
@@ -17,6 +17,10 @@ p,span {
 		margin-top: 32px;
 	}
 
+	&.bottom32 {
+		margin-bottom: 32px;
+	}
+
 	&.bottom8 {
 		margin-bottom: 8px;
 	}
diff --git a/resources/sass/admin_new/pages/my_surveys/komentarji.scss b/resources/sass/admin_new/pages/my_surveys/komentarji.scss
new file mode 100644
index 000000000..dc96cee67
--- /dev/null
+++ b/resources/sass/admin_new/pages/my_surveys/komentarji.scss
@@ -0,0 +1,86 @@
+fieldset.comments {
+
+    legend {
+        span {
+            font-size: 14px;
+            text-transform: none;
+            color: $black;
+            font-weight: 400;
+        }
+    }
+   
+    p.indent {
+        margin-left: 26px;
+    }
+
+    div.indent {
+        margin-left: 29px;
+    }
+
+    div.links {
+        display: flex;
+        flex-direction: row;
+        
+        div.button {
+            border: 1px solid $gray;
+            box-sizing: border-box;
+            padding: 5px 16px;
+            font-size: 14px;
+            margin-right: 16px;
+            cursor: pointer;
+
+            &.blue {
+                border-color: $blue;
+            }
+
+            span.faicon {
+                font-size: 14px;
+                margin-right: 8px;
+            }
+        }
+    }
+
+    textarea {
+        width: 587px;
+        height: 174px;
+        margin-bottom: 16px;
+    }
+
+    .top0 {
+        margin-top: 0;
+    }
+
+    div.setting_holder {
+        
+        &.horizontal {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+
+            .setting_title {
+                margin-right: 20px;
+            }
+
+            .setting_item {
+                margin-top: 0;
+
+                .dropdown {
+                    margin-top: 0;
+                    margin-right: 32px;
+
+                    width: 210px;
+                }
+
+                input {
+                    margin-top: 0;
+                }
+            }
+        }
+    }
+}
+
+div#komentarji_napredno {
+    fieldset:last-of-type {
+        margin-bottom: 0;
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
index 39c2d6b2b..c0dd17945 100644
--- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
+++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
@@ -11,4 +11,5 @@
 @import "testiranje";
 @import "oblika_teme";
 @import "objava";
+@import "komentarji";
 
diff --git a/resources/sass/admin_new/pages/settings/settings.scss b/resources/sass/admin_new/pages/settings/settings.scss
index af3d41da0..2db152651 100644
--- a/resources/sass/admin_new/pages/settings/settings.scss
+++ b/resources/sass/admin_new/pages/settings/settings.scss
@@ -1,2 +1,3 @@
 @import "moj_profil";
-@import "sistemske_nastavitve";
\ No newline at end of file
+@import "sistemske_nastavitve";
+@import "uporabniki";
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/settings/uporabniki.scss b/resources/sass/admin_new/pages/settings/uporabniki.scss
new file mode 100644
index 000000000..4fe1274c7
--- /dev/null
+++ b/resources/sass/admin_new/pages/settings/uporabniki.scss
@@ -0,0 +1,104 @@
+div.subpage_uporabniki {
+
+    .data_table_top_holder{
+        position: relative;
+        display: flex;
+        align-items: center;
+
+        white-space: nowrap;
+    
+        box-sizing: border-box;
+        margin: 0 14px 16px 14px;
+        padding: 6px 16px;
+    
+        background: $light-gray;
+        border: 1px solid $gray;
+        border-radius: 2px;
+
+        font-size: 14px !important;
+
+        .osnova {
+            box-sizing: border-box;
+            padding-right: 8px;
+            margin-right: 8px;
+            border-right: 1px solid $dark-gray;
+            &.no_border {
+                border: none;
+            }
+            
+            display: flex;
+            align-items: center;
+
+            select,
+            input {
+                padding: 3px 5px;
+                margin: 0 0 0 8px;
+                width: 123px;
+                vertical-align: middle;
+            }
+        }
+    
+        .dataSettingsBasic{
+            display: flex;
+    
+            margin-right: 8px;
+            padding-right: 8px;
+            border: none;
+
+            button.white-blue{
+                height: 28px;
+                width: 140px;
+                min-width: auto;
+                padding: 0;
+    
+                line-height: 12px;
+                font-weight: 400;
+                color: $black;
+    
+                border-radius: 2px;
+
+                &.border_blue {
+                    border-color: $blue;
+                }
+    
+                .faicon:before{
+                    margin-right: 8px;
+    
+                    font-size: 12px;
+                    color: $blue;
+                }
+            }
+        }
+
+        //Alignment na konec
+        #end {
+            width: 100%;
+            display: flex;
+            justify-content: flex-end;
+        }
+    }
+
+    table.usersTable {
+        margin-left: 14px;
+        margin-right: 14px;
+
+        width: calc(100% - 2*14px);
+
+        white-space: nowrap;
+
+        thead,
+        tbody {
+            th {
+                font-weight: $semi-bold;
+                background-color: $light-gray;
+            }
+
+            td,
+            th {
+                padding: 8px 16px;
+                border-top: 1px solid $gray;
+                vertical-align: middle;
+            }
+        }
+    }
+}
\ No newline at end of file