diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 3a8e46320..e2eb09f0a 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -138,7 +138,7 @@ class SurveyAdminSettings {
 
 				echo '<div class="setting_holder">';
 				echo '<label for="anketa_folder">'. $lang['srv_newSurvey_survey_new_folder'] .Help::display('srv_nova_shrani').':</label>';
-				echo '<select class="dropdown large" name="anketa_folder" id="anketa_folder">';
+				echo '<select class="dropdown large w400" name="anketa_folder" id="anketa_folder">';
 				echo '<option value="0" '.($selected_folder == 0 ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 				while($rowF = mysqli_fetch_array($sqlF)){
 					echo '<option value="'.$rowF['id'].'" '.($rowF['id'] == $selected_folder ? ' selected="selected"' : '').'>'.$rowF['naslov'].'</option>';
@@ -208,28 +208,31 @@ class SurveyAdminSettings {
 			echo '</div>';
             
             // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
-			echo '<div class="setting_holder">';
 
-			echo '<p class="bottom8">'.$lang['srv_language_link2'].':';
 			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
             $userAccess = UserAccess::getInstance($global_user_id);
             if($userAccess->checkUserAccess($what='prevajanje')){
-                echo '&nbsp;<a href="index.php?anketa='.$this->anketa.'&a=prevajanje" title="'.$lang['srv_language_link'].'"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
-            }
-            else{            
-                echo '&nbsp;<a href="#" onClick=popupUserAccess(\'prevajanje\'); return false;" title="'.$lang['srv_language_link'].'" class="user_access_locked"><span class="bold">'.$lang['srv_language_link'].'</span></a></p>';
-            }			
-			echo '<p>'.$lang['srv_language_mySurveys'].'.</p>';
 
+				$lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;';
+				$color = 'blue';
+            }
+            else{  
+				$lang_link = 'popupUserAccess(\'prevajanje\'); return false;';
+				$color = 'yellow user_access_locked';          
+            }	
+
+			echo '<div class="button_holder top16 bottom0">';
+			echo '<button class="medium '.$color.'" onClick="'.$lang_link.'">'.$lang['srv_multi_lang'].'</button>';				
 			echo '</div>';
+
 			
 			echo '</fieldset>';
 
-			// Gumb shrani - vmes
+			/*/ Gumb shrani - vmes
 			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 '</div>';*/
 			
 					
 			/* INTERAKTIVNI ELEMENTI */
@@ -251,33 +254,67 @@ class SurveyAdminSettings {
 				
 			// Indikator napredka
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="progressbar1" name="progressbar" value="1" '.($row['progressbar'] == 1 && $multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
-			echo '<label for="progressbar1" '.(!$multiple_pages ? 'disabled' : '').'>'. $lang['yes'] .'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="progressbar0" name="progressbar" value="0" '.($row['progressbar'] == 0 || !$multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
-			echo '<label for="progressbar0" '.(!$multiple_pages ? 'disabled' : '').'>'. $lang['no1'].'</label> ';
-			echo '</div>';
-
+			echo '<input type="hidden" name="progressbar" value="0">';
+            echo '<input type="checkbox" id="progressbar" name="progressbar" value="1" '.($row['progressbar'] == 1 && $multiple_pages ? ' checked="checked"' : '').' '.(!$multiple_pages ? 'disabled' : '').'>';
+            echo '<label for="progressbar">'.$lang['srv_te_progressbar'].' '.Help::display('srv_show_progressbar').'</label> ';
 			echo '</div>';
 			
 			// Naslov ankete za uporabnike
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_show_title'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="survey_hide_title1" name="survey_hide_title" value="0" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>';
-			echo '<label for="survey_hide_title1">'. $lang['yes'] .'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="survey_hide_title0" name="survey_hide_title" value="1" '.($survey_hide_title == 1 ? ' checked="checked"' : '').'>';
-			echo '<label for="survey_hide_title0">'. $lang['no1'] .'</label> ';
+			echo '<input type="hidden" name="survey_hide_title" value="1">';
+            echo '<input type="checkbox" id="survey_hide_title" name="survey_hide_title" value="0" '.($survey_hide_title == 0 ? ' checked="checked"' : '').'>';
+            echo '<label for="survey_hide_title">'.$lang['srv_show_title'].'</label> ';
 			echo '</div>';
 
+			// Nadaljuj kasneje
+			if($this->survey_type > 1){
+                echo '<div class="setting_holder">';
+				echo '<input type="hidden" name="continue_later" value="0">';
+            	echo '<input type="checkbox" id="continue_later" name="continue_later" value="1" '.($row['continue_later'] == 1 ? ' checked="checked"' : '').'>';
+            	echo '<label for="continue_later">'.$lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').'</label> ';
+                echo '</div>';
+			}
+
+			// Gumb nazaj
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="display_backlink" value="0">';
+			echo '<input type="checkbox" id="display_backlink" name="display_backlink" value="1" '.($display_backlink!=='0'?' checked':'').'>';
+			echo '<label for="display_backlink">'.$lang['srv_slideshow_sett_back_button_lbl'].'</label> ';
 			echo '</div>';
+
+			// Namig
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="survey_hint" value="0">';
+			echo '<input type="checkbox" id="survey_hint" name="survey_hint" value="1" '.($survey_hint == 1 ? ' checked="checked"' : '').'>';
+			echo '<label for="survey_hint">'.$lang['srv_hint'].' '.Help::display('srv_namig_setting').'</label> ';
+			echo '</div>';
+
+			/* KNJIZNICA */
+			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'");
+			$moje = mysqli_num_rows($sqlk);
+			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'");
+			$javne = mysqli_num_rows($sqlk);
+			
+			if ($admin_type == 0 || $admin_type == 1) {
+
+				echo '<div class="setting_holder">';
+				echo '<input type="hidden" name="javne_ankete" value="0">';
+				echo '<input type="checkbox" id="javne_ankete" name="javne_ankete" value="1" '.($javne==1?' checked':'').' onchange="javascript:check_library();">';
+				echo '<label for="javne_ankete">'.$lang['srv_javne_ankete'].'</label> ';
+				echo '</div>';				
+			}
+			
+			echo '<div class="setting_holder" id="moje_ankete">';
+			echo '<input type="hidden" name="moje_ankete" value="0">';
+			echo '<input type="checkbox" id="moje_ankete" name="moje_ankete" value="1" '.($moje==1?' checked':'').'>';
+			echo '<label for="moje_ankete">'.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').'</label> ';
+			echo '</div>';
+
+			?>
+			<script>
+			check_library();
+			</script>
+			<?
 			
 			// Politika zasebnosti
 			echo '<div class="setting_holder">';
@@ -298,52 +335,6 @@ class SurveyAdminSettings {
 
 			echo '</div>';
 			
-			// Nadaljuj kasneje
-			if($this->survey_type > 1){
-                echo '<div class="setting_holder">';
-                echo '<span class="setting_title">'. $lang['srv_show_continue_later'].' '.Help::display('srv_continue_later_setting').':</span>';
-                
-                echo '<div class="setting_item">';
-                echo '<input type="radio" name="continue_later" value="1" id="continue_later_1"' . ($row['continue_later'] == 1 ? ' checked="checked"' : '') . '>';
-                echo '<label for="continue_later_1">'.$lang['yes'].'</label>';
-                echo '</div>';
-                echo '<div class="setting_item">';
-                echo '<input type="radio" name="continue_later" value="0" id="continue_later_0"' . ($row['continue_later'] == 0 ? ' checked="checked"' : '') . '>';
-                echo '<label for="continue_later_0">'.$lang['no1'].'</label>';
-                echo '</div>';
-
-                echo '</div>';
-			}
-			
-			// Gumb nazaj
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_slideshow_sett_back_button_lbl'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="display_backlink" id="display_backlink_1" '.($display_backlink!=='0'?' checked':'').' value="">';
-			echo '<label for="display_backlink_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="display_backlink" id="display_backlink_0" '.($display_backlink==='0'?' checked':'').' value="0">';
-			echo '<label for="display_backlink_0">'.$lang['no'].'</label>';
-			echo '</div>';
-
-			echo '</div>';
-			
-			// Namig
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_hint'].' '.Help::display('srv_namig_setting').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="namig1" name="survey_hint" value="1"' . ($survey_hint == 1 ? ' checked="checked"' : '') . '>';
-			echo '<label for="namig1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input id="namig0" type="radio" name="survey_hint" value="0"' . ($survey_hint == 0 ? ' checked="checked"' : '') . '>';
-			echo '<label for="namig0">'.$lang['no1'].'</label>';
-			echo '</div>';
-			
-			echo '</div>';
 			
 			// Oozorilo na vprašanja
 			echo '<div class="setting_holder">';
@@ -360,7 +351,7 @@ class SurveyAdminSettings {
 			
 			echo '</div>';
 			
-			// Napredni parapodatki
+			/*/ Napredni parapodatki
 			if (($admin_type == 0 || $admin_type == 1) && $this->survey_type > 0) {
 				echo '<div class="setting_holder">';
 				echo '<span class="seting_title">'.$lang['srv_parapodatki'].':</span>';
@@ -410,7 +401,7 @@ class SurveyAdminSettings {
 				echo '</div>';
 	
 				echo '</div>';
-			}
+			}*/
  
 			echo '</fieldset>';
 					
@@ -501,81 +492,21 @@ class SurveyAdminSettings {
 				echo '</fieldset>';			
 			}
 						
-			/* KNJIZNICA */
-			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='$global_user_id'");
-			$moje = mysqli_num_rows($sqlk);
-			$sqlk = sisplet_query("SELECT * FROM srv_library_anketa WHERE ank_id='$this->anketa' AND uid='0'");
-			$javne = mysqli_num_rows($sqlk);
-			
-			echo '<fieldset>';
-			echo '<legend>'.$lang['srv_library'].'</legend>';
-			if ($admin_type == 0 || $admin_type == 1) {
-				echo '<span class="setting_title" >'.$lang['srv_javne_ankete'].':';
-
-				echo '<div class="setting_holder">';
-
-				echo '<div class="setting_item">';
-				echo '<input type="radio" id="javne_ankete0" name="javne_ankete" value="0"'.($javne==0?' checked':'').' onchange="javascript:check_library();">';
-				echo '<label for="javne_ankete0">'.$lang['no'].'</label>';
-				echo '</div>';
-				echo '<div class="setting_item">';
-				echo '<input type="radio" id="javne_ankete1" name="javne_ankete" value="1"'.($javne==1?' checked':'').' onchange="javascript:check_library();">';
-				echo '<label for="javne_ankete1">'.$lang['yes'].'</label>';
-				echo '</div>';
-				
-				echo '</div>';				
-			}
-			
-			echo '<div class="setting_holder" id="moje_ankete">';
-			echo '<span class="setting_title">'.$lang['srv_moje_ankete'].' '.Help::display('srv_moje_ankete_setting').':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="moje_ankete0" name="moje_ankete" value="0"'.($moje==0?' checked':'').'>';
-			echo '<label for="moje_ankete0">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" id="moje_ankete1" name="moje_ankete" value="1"'.($moje==1?' checked':'').'>';
-			echo '<label for="moje_ankete1">'.$lang['yes'].'</label>';
-			echo '</div>';
-
-			echo '</div>';
-			
-			// zamakni
-			/*echo '<div class="setting_holder">';
-
-			echo '<span class="setting_title">'.$lang['a_show'].'</span>'; 
-			echo '<div class="setting_item">';
-			if ($row['flat'] == 0)
-				echo '<span title="'.$lang['srv_flat_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=1">'.$lang['srv_flat_0_short'].'</a></span> ';
-			else
-				echo '<span title="'.$lang['srv_flat_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=flat&value=0">'.$lang['srv_flat_0_short'].'</a></span> ';
-			echo Help::display('srv_branching_flat');
-			echo '</div>';
-			
-			// odpri
-			echo '<div class="setting_item">';
-			if ($row['popup'] == 1)
-				echo '<span class="spaceLeft" title="'.$lang['srv_popup_1'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=0">'.$lang['srv_popup_1_short'].'</a></span> ';
-			else
-				echo '<span class="spaceLeft" title="'.$lang['srv_popup_0'].'"><a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=popup&value=1">'.$lang['srv_popup_1_short'].'</a></span> ';
-			echo Help::display('srv_branching_popup');
-			echo '</div>';
-
-			echo '</div>';*/
-
-			
-			echo '</fieldset>';
-			
-			?>
-			<script>
-			check_library();
-			</script>
-			<?
-						
 			/* STEVILCENJE */
 			echo '<fieldset>';
 			echo '<legend>' . $lang['srv_nastavitveStevilcenje'] . '</legend>';
 
+			// Izklop prestevilcevanja
+			$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
+			
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="enumerate" value="0">';
+			echo '<input type="checkbox" id="enumerate" name="enumerate" value="1" '.($enumerate == 1 ? ' checked' : '').'>';
+			echo '<label for="enumerate">'.$lang['srv_nastavitvePrestevilcevanje'].'</label> ';
+			echo '</div>';
+
+			//način številčenja
+
 			echo '<div class="setting_holder">';
 			echo '<span class="setting_title"><label for="anketa_countType">' . $lang['srv_nastavitveStevilcenjeType'] . ':</label></span>';
 
@@ -598,33 +529,14 @@ class SurveyAdminSettings {
 
 			echo '</div>';
 			
-			// Izklop prestevilcevanja
-			$enumerate = SurveySetting::getInstance()->getSurveyMiscSetting('enumerate'); if ($enumerate == '') $enumerate = 1;
-			
-			echo '<div class="setting_holder">';
-			echo '<span class="setting_title"><label for="anketa_enumerate">'.$lang['srv_nastavitvePrestevilcevanje'].':</label></span>';
-
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="enumerate" id="enumerate_1" '.($enumerate == 1 ? ' checked' : '').' value="1">';
-			echo '<label for="enumerate_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="enumerate" id="enumerate_0" '.($enumerate == 0 ? ' checked' : '').' value="0">';
-			echo '<label for="enumerate_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
 			echo '</fieldset>';
 						
 			/* JS TRACKING */
 			if ($admin_type == 0 || $admin_type == 1) {
 				echo '<fieldset><legend>'.$lang['srv_js_tracking'].'</legend>';
 				echo '<div class="setting_holder">';
-				echo '<textarea name="js_tracking">'.$row['js_tracking'].'</textarea>';
-				echo '<p>'.$lang['js_tracking_note'].'</p>';
-
+				echo '<span class="setting_title">'.$lang['js_tracking_note'].'</span>';
+				echo '<textarea class="textarea w800" name="js_tracking">'.$row['js_tracking'].'</textarea>';
 				echo '</div>';
 
 				echo '</fieldset>';
@@ -1889,16 +1801,10 @@ class SurveyAdminSettings {
 			$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
 
 			echo '<div class="setting_holder '.($mobile_friendly!=='1' ? 'bottom0':'').'" id="mobile_osnovno">';
-			
-			echo '<span class="setting_title" >'.$lang['srv_settings_mobile_friendly'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="mobile_friendly" id="mobile_friendly_1" '.($mobile_friendly==='1'?' checked':'').' value="1" onClick="$(\'#mobile_settings_other\').removeClass(\'displayNone\');$(\'#mobile_osnovno\').removeClass(\'bottom0\');">';
-			echo '<label for="mobile_friendly_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="mobile_friendly" id="mobile_friendly_0" '.($mobile_friendly!=='1'?' checked':'').' value="0" onClick="$(\'#mobile_settings_other\').addClass(\'displayNone\');$(\'#mobile_osnovno\').addClass(\'bottom0\');">';
-			echo '<label for="mobile_friendly_0">'.$lang['no'].'</label> ';
-			echo '</div>';
+
+            echo '<input type="hidden" name="mobile_friendly" value="0">';
+            echo '<input type="checkbox" id="mobile_friendly" name="mobile_friendly" value="1" '.($mobile_friendly == 1 ? ' checked="checked"' : '').' onChange="$(\'#mobile_settings_other\').toggleClass(\'displayNone\');$(\'#mobile_osnovno\').toggleClass(\'bottom0\');">';
+            echo '<label for="mobile_friendly">'. $lang['srv_settings_mobile_friendly'] .'</label> ';
 
 			echo '</div>';
 
@@ -1910,19 +1816,12 @@ class SurveyAdminSettings {
 			$hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
 			echo '<div class="setting_holder">';
 
-			echo '<span class="setting_title" >'.$lang['srv_settings_mobile_img'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="hide_mobile_img" id="hide_mobile_img_0" '.($hide_mobile_img!=='1'?' checked':'').' value="0">';
-			echo '<label for="hide_mobile_img_0">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="hide_mobile_img" id="hide_mobile_img_1" '.($hide_mobile_img==='1'?' checked':'').' value="1">';			
-			echo '<label for="hide_mobile_img_1">'.$lang['no'].'</label> ';
-			echo '</div>';
+            echo '<input type="hidden" name="hide_mobile_img" value="1">';
+            echo '<input type="checkbox" id="hide_mobile_img" name="hide_mobile_img" value="0" '.($hide_mobile_img!= 1 ? ' checked="checked"' : '').'>';
+            echo '<label for="hide_mobile_img">'. $lang['srv_settings_mobile_img'] .'</label> ';
 
 			echo '</div>';
 
-			
 			// Prilagoditev tabel pri mobilnikih
 			$mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
 			echo '<div class="setting_holder">';
@@ -7016,22 +6915,6 @@ class SurveyAdminSettings {
 		
 		$rowa = SurveyInfo::getInstance()->getSurveyRow();
 		
-		echo '<div id="comment_question_note">';
-
-		echo $lang['srv_komentarji_imate'].' ';
-		if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '<span class="red">';
-		echo $this->string_format((int)($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']), 'srv_cnt_komentarji');			
-		if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '</span>';
-		
-		echo ' '.$lang['srv_komentarji_odskupno'].' ';
-		echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od');
-		echo '</div>';
-
-
-		echo '<div class="testni_vnos">';
-		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon monitor link-right"></span> '.$lang['srv_survey_testdata'].'</a>';
-		echo '</div>';
-		
 		
 		# VV: privzeto naj bodo samo nerešeni komentarji
 		if (!isset($_GET['only_unresolved'])) {
@@ -7081,9 +6964,28 @@ class SurveyAdminSettings {
 		echo '<div class="komentarji_anketa_holder">';		
 		
 		// Splosni komentarji urednikov - levo
-		echo '<div class="komentarji_anketa komentarji_ured">';		
-		echo '<fieldset><legend>'.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')</legend>';
+		echo '<div class="komentarji_anketa komentarji_ured">';
 		
+		echo '<div class="comment_type">';
+
+		echo $lang['srv_admin_comment'].':';
+		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+		
+		echo '</div>';
+
+		// Dodajanje novega komentarja
+
+		echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
+		echo $lang['srv_add_comment_toggle'];
+		echo '</div>';
+
+		echo '<div class="comment_wrapper" id="comment_wrapper_0_4">';
+		echo '<div class="new_comment" id="survey_comment_0_4">';
+		$ba = new BranchingAjax($this->anketa);
+		$ba->add_comment_field(0, '1', '4', false);
+		echo '</div>';
+		echo '</div>';
 		
 		$sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." ");
 		$rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1;
@@ -7094,52 +6996,71 @@ class SurveyAdminSettings {
 				
 				if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) {
 					
-					echo '<div class="comment_box">';
+					echo '<div class="comment_box '.($row['ocena']==0 ? '' : 'archived').'">';
 
 					echo '<div class="by">';
-					echo $lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span>'.$lang['srv_comments_user2'];
-					echo '</div>';
 
 					$datetime = strtotime($row['time']);
 					$datetime = date("d.m.Y G:i", $datetime);
 
-					echo '<div class="date">';
-					echo $datetime;
-					echo '</div>';
+
+					echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($row['uid']).'</span> ('.$datetime.')</p>';
+
+					
+					if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
+					
+						echo '<div class="options">';
+
+						echo '<div class="solve">';
+						if ($row['ocena']==0) {
+							echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+							echo $lang['srv_comments_archive'].'</p>';
+						}
+						else {
+							echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+							echo $lang['srv_comments_unarchive'].'</p>';
+						}
+						echo '</div>';
+
+						echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$row['id'].'" onClick="toggleCommentOptions(\''.$row['id'].'\');"></span>';
+
+							echo '<div class="options_dropdown displayNone" id="options_'.$row['id'].'">';
+							
+							echo '<div class="line">';
+							echo '<span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment']; // pri splošnih ni odgovorov?
+							echo '</div>';
+							
+							echo '<div class="line">';
+							echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+							echo $lang['srv_comment_delete'];
+							echo '</div>';
+							
+							echo '</div>';
+
+							//Klik izven razprith nastavitev - zapremo okno
+							echo '<script>
+							$(document).mouseup(function(e){
+								var container = $(".options_dropdown");
+							
+								if (!container.is(e.target) && container.has(e.target).length === 0){
+									$(".options_dropdown").addClass("displayNone");
+								}
+							});
+						</script>';
+
+
+						
+						echo '</div>'; //options
+						
+					}
+
+					echo '</div>'; //by
+
 
 					echo '<div class="content">';
 					echo $row['vsebina'];
 					echo '</div>';
 
-					
-                    if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
-
-					    echo '<div class="bottom_options">';
-
-                        if ($commentmarks == 1) {
-                            echo '	<select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
-                                        <option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
-                                        <option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
-                                        <option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
-                                        <option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
-                                    </select>';
-                        } 
-                        else {
-
-                            if ($row['ocena']==0) {
-                                echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-                                echo $lang['srv_comments_archive'].'</p>';
-                            }
-                            else {
-                                echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-                                echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-                                echo $lang['srv_comments_unarchive'].'</p>';
-                            }
-                        }
-
-                        echo '</div>';
-                    }
-
 					echo '</div>';
 				}
 
@@ -7157,42 +7078,33 @@ class SurveyAdminSettings {
 			}
 		}
 
-		// Dodajanje novega komentarja
 
-		echo '<div id="comment_toggle_0_4" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_4\')">';
-		echo '<span class="faicon link-right comments"></span>';
-		echo $lang['srv_add_comment_toggle'];
-		echo '</div>';
-
-		echo '<div class="comment_wrapper" id="comment_wrapper_0_4">';
-		echo '<div class="new_comment" id="survey_comment_0_4">';
-		$ba = new BranchingAjax($this->anketa);
-		$ba->add_comment_field(0, '1', '4', false);
-		echo '</div>';
-		echo '</div>';
-
-		echo '</fieldset>';
 		echo '</div>';
 		
 		
 		// Splosni komentarji respondentov - desno
-		echo '<div class="komentarji_anketa komentarji_resp">';		
-		echo '<fieldset><legend>'.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')</legend>';
+		echo '<div class="komentarji_anketa komentarji_resp">';	
+		
+		echo '<div class="comment_type">';
+		echo $lang['srv_repondent_comment'].':';
+		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+		echo '</div>';
 		
 		$sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby");
 		if (mysqli_num_rows($sql) > 0) {
 
 			while ($row = mysqli_fetch_array($sql)) {
 
-				echo '<div class="comment_box">';
+				echo '<div class="comment_box '.($row['ocena']==0 ? '' : 'archived').'">';
 
 				$datetime = strtotime($row['comment_time']);
 				$datetime = date("d.m.Y G:i", $datetime);
-				
+
+				echo '<div class="by">';
+
 				if($row['usr_id'] == 0){
-					echo '<div class="by">';
-					echo 'Respondent '.$lang['srv_comments_user2'];
-					echo '</div>';
+					echo '<p>Respondent ('.$datetime.')</p>';
 				}
 				else{
 					$sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'");
@@ -7200,48 +7112,65 @@ class SurveyAdminSettings {
 					
 					$user = $rowU['name'];
 
-					echo '<div class="by">';
-					echo $lang['srv_comments_user'].'<span class="user">'.$user.'</span>'.$lang['srv_comments_user2'];
-					echo '</div>';
+					echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$user.'</span> ('.$datetime.')</p>';
+
 				}
 
-				echo '<div class="date">';
-				echo $datetime;
-				echo '</div>';
+				if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
+					
+					echo '<div class="options">';
+
+					echo '<div class="solve">';
+					if ($row['ocena']==0) {
+						echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+						echo $lang['srv_comments_archive'].'</p>';
+					}
+					else {
+						echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+						echo $lang['srv_comments_unarchive'].'</p>';
+					}
+					echo '</div>';
+
+					echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$row['id'].'" onClick="toggleCommentOptions(\''.$row['id'].'\');"></span>';
+
+						echo '<div class="options_dropdown displayNone" id="options_'.$row['id'].'">';
+						
+						echo '<div class="line">';
+						echo '<span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment']; // pri splošnih ni odgovorov?
+						echo '</div>';
+						
+						echo '<div class="line">';
+						echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+						echo $lang['srv_comment_delete'];
+						echo '</div>';
+						
+						echo '</div>';
+
+						//Klik izven razprith nastavitev - zapremo okno
+						echo '<script>
+						$(document).mouseup(function(e){
+							var container = $(".options_dropdown");
+						
+							if (!container.is(e.target) && container.has(e.target).length === 0){
+								$(".options_dropdown").addClass("displayNone");
+							}
+						});
+					</script>';
+
+
+					
+					echo '</div>'; //options
+					
+				}
+
+				echo '</div>'; //by
+
 
 				echo '<div class="content">';
 				echo $row['comment'];
 				echo '</div>';
 				
 				
-                if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) {
-
-                    echo '<div class="bottom_options">';
-                   
-                    if ($commentmarks == 1) {
-                        echo '	<select name="ocena'.$row['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});">
-                                    <option value="0"'.($row['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
-                                    <option value="1"'.($row['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
-                                    <option value="2"'.($row['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
-                                    <option value="3"'.($row['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
-                                </select>';
-                    } 
-                    else {
-
-                        if ($row['ocena']==0) {
-                            echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-                            echo $lang['srv_comments_archive'].'</p>';
-                        }
-                        else {
-                            echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-                            echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowa['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-                            echo $lang['srv_comments_unarchive'].'</p>';
-                        }
-                    }
-
-                    echo '</div>';
-                }
-				
 				echo '</div>';
 
 			}
@@ -7256,9 +7185,8 @@ class SurveyAdminSettings {
 				echo '<p class="bottom16">'.$lang['srv_no_comments'].'</p>';
 			}
 		}
-		// Dodajanje novega komentarja
+		/* Dodajanje novega komentarja
 		echo '<div id="comment_toggle_0_5" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\'0_5\')">';
-		echo '<span class="faicon link-right comments"></span>';
 		echo $lang['srv_add_comment_toggle'];
 		echo '</div>';
 
@@ -7268,9 +7196,8 @@ class SurveyAdminSettings {
 		$ba->add_comment_field(0, '4', '5', false);
 		echo '</div>';
 
-		echo '</div>';
+		echo '</div>';*/
 
-		echo '</fieldset>';
 		echo '</div>';
 
 		echo '</div>'; // div.komentarji_anketa_holder
@@ -7536,32 +7463,6 @@ class SurveyAdminSettings {
 		$comment_count = $this->testiranje_komentarji_count();
 		
 		
-		echo '<div id="comment_question_note">';
-				
-		echo $lang['srv_komentarji_imate'].' ';
-		if($comment_count['question']['unresolved'] > 0) echo '<span class="red">';
-		echo $this->string_format((int)$comment_count['question']['unresolved'], 'srv_cnt_komentarji');			
-		if($comment_count['question']['unresolved'] > 0) echo '</span>';
-		
-		echo ' '.$lang['srv_komentarji_odskupno'].' ';
-		echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od');
-		
-		echo '</div>';
-		
-		
-		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho '&nbsp;<span class="tooltip clr spaceLeft">';
-		echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
-		echo '<b>' . $lang['srv_survey_testdata2'] . ':</b> '.$lang['srv_testdata_text'].'';
-		echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
-		echo '<span class="arrow"></span>';
-		echo '</span>';	// expanded-tooltip bottom
-		echo '</span>'; // tooltip */
-		
-		echo '<div class="testni_vnos">';
-		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank"><span class="faicon link-right monitor"></span>'.$lang['srv_survey_testdata'].'</a>';
-		echo '</div>';
-		
-		
 		# VV: privzeto naj bodo samo nerešeni komentarji
 		if (!isset($_GET['only_unresolved'])) {
 			$_GET['only_unresolved'] = 1;
@@ -7698,6 +7599,9 @@ class SurveyAdminSettings {
 								echo '<div class="comment_type">';
 
                                 echo $lang['srv_admin_comment'].':';
+
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
                                 
                                 echo '</div>';
 
@@ -7769,7 +7673,6 @@ class SurveyAdminSettings {
 
 
 							echo '<div id="comment_toggle_'.$spr_id.'" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\''.$spr_id.'\')">';
-                            echo '<span class="faicon link-right comments"></span>';
                             echo $lang['srv_add_comment_toggle'];
                             echo '</div>';
 
@@ -7864,81 +7767,9 @@ class SurveyAdminSettings {
 						
 						echo '<div class="question_comment editor">';
 
-						// komentarji urednikov
-						if ($row1['thread'] > 0) {
-							
-							if (mysqli_num_rows($sqlt) > 0) {
-
-								echo '<div class="comment_type">';
-
-								echo $lang['srv_admin_comment'].':';
-								
-								echo '</div>';
-						
-								$i = 0;
-								while ($rowt = mysqli_fetch_array($sqlt)) {
-
-									echo '<div class="comment_box">';
-
-									echo '<div class="by">';
-									echo $lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span>'.$lang['srv_comments_user2'];
-									echo '</div>';
-
-									$datetime = strtotime($rowt['time']);
-									$datetime = date("d.m.Y G:i", $datetime);
-
-									echo '<div class="date">';
-									echo $datetime;
-									echo '</div>';
-
-									echo '<div class="content">';
-									echo $rowt['vsebina'];
-									echo '</div>';
-
-                                    if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
-                                        
-                                        echo '<div class="bottom_options">';
-                                        if ($commentmarks == 1) {
-                                            echo '	<select name="ocena" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
-                                                        <option value="0"'.($rowt['ocena']==0?' selected="selected"':'').'>'.$lang['srv_undecided'].'</option>
-                                                        <option value="1"'.($rowt['ocena']==1?' selected="selected"':'').'>'.$lang['srv_todo'].'</option>
-                                                        <option value="2"'.($rowt['ocena']==2?' selected="selected"':'').'>'.$lang['srv_done'].'</option>
-                                                        <option value="3"'.($rowt['ocena']==3?' selected="selected"':'').'>'.$lang['srv_not_relevant'].'</option>
-                                                    </select>';
-                                        } else {
-
-											if ($rowt['ocena']==0) {
-												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-												echo $lang['srv_comments_archive'].'</p>';
-
-												echo '<div class="reply_to">';
-												echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$datetime.'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
-												echo '</div>';
-											}
-											else {
-												echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-												echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-												echo $lang['srv_comments_unarchive'].'</p>';
-											}
-                                        }
-                                        
-                                        echo '</div>';
-                                    }
-
-									echo '</div>';
-
-									echo '<div class="reply_to_text" id="comment_on_comment_'.$rowt['id'].'">';
-									echo '</div>';
-								}
-
-							}
-
-						}
-
 						if ($addfieldposition == '' || $addfieldposition == 0) {
 
-							echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle blue pointer" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
-							echo '<span class="faicon link-right comments"></span>';
+							echo '<div id="comment_toggle_'.$spr_id.'_'.'4'.'" class="add_comment_toggle" onClick="toggleAddComment(\''.$spr_id.'_'.'4'.'\')">';
 							echo $lang['srv_add_comment_toggle'];
 							echo '</div>';
 
@@ -7951,6 +7782,98 @@ class SurveyAdminSettings {
 							echo '</div>';
 						}
 
+						// komentarji urednikov
+						if ($row1['thread'] > 0) {
+							
+							if (mysqli_num_rows($sqlt) > 0) {
+
+								echo '<div class="comment_type">';
+
+								echo $lang['srv_admin_comment'].':';
+
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+								
+								echo '</div>';
+						
+								$i = 0;
+								while ($rowt = mysqli_fetch_array($sqlt)) {
+
+
+									echo '<div class="comment_box '.($rowt['ocena']==0 ? '' : 'archived').'">';
+
+									echo '<div class="by">';
+
+									$datetime = strtotime($rowt['time']);
+									$datetime = date("d.m.Y G:i", $datetime);
+
+									echo '<p>'.$lang['srv_comments_user'].'<span class="user">'.$f->user($rowt['uid']).'</span> ('.$datetime.')</p>';
+
+									
+									if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
+									
+										echo '<div class="options">';
+                                        
+										echo '<div class="solve">';
+										if ($rowt['ocena']==0) {
+											echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+											echo $lang['srv_comments_archive'].'</p>';
+										}
+										else {
+											echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+											echo $lang['srv_comments_unarchive'].'</p>';
+										}
+										echo '</div>';
+
+										echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$rowt['id'].'" onClick="toggleCommentOptions(\''.$rowt['id'].'\');"></span>';
+
+											echo '<div class="options_dropdown displayNone" id="options_'.$rowt['id'].'">';
+											
+											echo '<div class="line">';
+											echo '<a href="javascript:comment_on_comment(\''.$rowt['id'].'\',\''.$f->user($rowt['uid']).'\',\''.$datetime.'\',\''.$spr_id.'\');"><span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment'].'</a>';
+											echo '</div>';
+											
+											echo '<div class="line">';
+											echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+											echo $lang['srv_comment_delete'];
+											echo '</div>';
+											
+											echo '</div>';
+
+											//Klik izven razprith nastavitev - zapremo okno
+											echo '<script>
+											$(document).mouseup(function(e){
+												var container = $(".options_dropdown");
+											
+												if (!container.is(e.target) && container.has(e.target).length === 0){
+													$(".options_dropdown").addClass("displayNone");
+												}
+											});
+										</script>';
+
+
+										
+										echo '</div>'; //options
+                                        
+                                    }
+
+									echo '</div>'; //by
+
+									echo '<div class="content">';
+									echo $rowt['vsebina'];
+									echo '</div>';
+
+
+									echo '</div>'; //comment_box
+
+									echo '<div class="reply_to_text" id="comment_on_comment_'.$rowt['id'].'">';
+									echo '</div>';
+								}
+
+							}
+
+						}
+
 						echo '</div>';
 						
 						
@@ -7963,6 +7886,8 @@ class SurveyAdminSettings {
 
 								echo '<div class="comment_type">';
 								echo $lang['srv_repondent_comment'].':';
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
 								echo '</div>';
 
 								if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " ";
@@ -7971,7 +7896,7 @@ class SurveyAdminSettings {
 								if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']);
 								while ($rowt = mysqli_fetch_array($sqlt)) {
 
-									echo '<div class="comment_box">';
+									echo '<div class="comment_box  '.($rowt['text2']==0 ? '' : 'archived').'">';
 
 									// Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja
 									$sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'");
@@ -7979,69 +7904,78 @@ class SurveyAdminSettings {
 										
 										$rowTime = mysqli_fetch_array($sqlTime);
 
+
 										echo '<div class="by">';
-										echo 'Respondent '.$lang['srv_comments_user2'];
-										echo '</div>';
-									
+
 										if ( strpos($rowt['text'], '__DATE__') !== false ) {
 											$rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']);
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
+											$datetime = '-';
+											
 										} 
 										else {
 
 											$datetime = strtotime($rowTime['time_edit']);
 											$datetime = date("d.m.Y G:i", $datetime);
-
-											echo '<div class="date">';
-											echo $datetime;
-											echo '</div>';
-											
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
 										}
+
+										echo '<p>Respondent ('.$datetime.')</p>';
+
+
+										if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
+										
+											echo '<div class="options">';
+
+											echo '<div class="solve">';
+											if ($rowt['text2']==0) {
+												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-check link-right"></span>';
+												echo $lang['srv_comments_archive'].'</p>';
+											}
+											else {
+												echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon fa-undo link-right"></span>';
+												echo $lang['srv_comments_unarchive'].'</p>';
+											}
+											echo '</div>';
+
+											echo '<span class="faicon pointer fa-ellipsis-h" id="dots_'.$rowt['id'].'" onClick="toggleCommentOptions(\''.$rowt['id'].'\');"></span>';
+
+												echo '<div class="options_dropdown displayNone" id="options_'.$rowt['id'].'">';
+												
+												echo '<div class="line">';
+												echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+												echo $lang['srv_comment_delete'];
+												echo '</div>';
+												
+												echo '</div>';
+
+												//Klik izven razprith nastavitev - zapremo okno
+												echo '<script>
+												$(document).mouseup(function(e){
+													var container = $(".options_dropdown");
+												
+													if (!container.is(e.target) && container.has(e.target).length === 0){
+														$(".options_dropdown").addClass("displayNone");
+													}
+												});
+											</script>';
+
+
+											
+											echo '</div>'; //options
+											
+										}
+
+										echo '</div>'; //by
+
 									}
 									else{
 										if ( strpos($rowt['text'], '__DATE__') !== false ) {
 											$rowt['text'] = str_replace('__DATE__', '', $rowt['text']);
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
 										} 
-										else {
-											echo '<div class="content">';
-											echo nl2br($rowt['text']);
-											echo '</div>';
-										}
 									}
 
-									if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
-
-										echo '<div class="bottom_options">';
-
-										if ($commentmarks == 1) {
-											echo '	<select name="ocena'.$rowt['id'].'" onchange="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: this.value, id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});">
-														<option value="0"'.($rowt['text2']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
-														<option value="1"'.($rowt['text2']==1?' selected':'').'>'.$lang['srv_todo'].'</option>
-														<option value="2"'.($rowt['text2']==2?' selected':'').'>'.$lang['srv_done'].'</option>
-														<option value="3"'.($rowt['text2']==3?' selected':'').'>'.$lang['srv_not_relevant'].'</option>
-													</select>';
-										} else {
-
-											if ($rowt['text2']==0) {
-												echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
-												echo $lang['srv_comments_archive'].'</p>';
-											}
-											else {
-												echo '<p class="archived_comment"><span class="faicon arhiv link-right"></span>'.$lang['srv_comments_archived'].'</p>';
-												echo '<p class="unarchive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_comment\', text2: (\'0\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon inv_sent_0 empty link-right"></span>';
-												echo $lang['srv_comments_unarchive'].'</p>';
-											}
-										}
-										echo '</div>';
-									}
+									echo '<div class="content">';
+									echo nl2br($rowt['text']);
+									echo '</div>';
 
 									echo '</div>';
 								}
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 6ccbac630..bf5f99a2e 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5656,4 +5656,8 @@ function show_gdpr_messeage(id_sporocila){
 	$("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id});
 
 	console.log(id_sporocila);
+}
+
+function toggleCommentOptions(id) {
+	$("#options_"+id).toggleClass("displayNone");
 }
\ No newline at end of file
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 0f9c89c5c..957172bad 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -759,6 +759,7 @@ function comment_on_comment (id, user, date, spr_id) {
 		'<button class="medium blue" onclick="$.post(\'ajax.php?a=comment_on_comment\', {id: \''+id+'\', vsebina: $(\'#vsebina_comment_on_comment_'+id+'\').val(), anketa: srv_meta_anketa_id}, function() {window.location.reload();}); return false;">'+lang['srv_comment_comment']+'</button>'+
 		'</div>'
 	);
+	$(".options_dropdown").addClass("displayNone");
 }
 
 
diff --git a/editors/ckeditor_4_4/config.js b/editors/ckeditor_4_4/config.js
index baf41d3be..e52959251 100644
--- a/editors/ckeditor_4_4/config.js
+++ b/editors/ckeditor_4_4/config.js
@@ -36,7 +36,7 @@ CKEDITOR.editorConfig = function (config) {
         '/',
         {name: 'other', items: ['Scayt', 'Strike', 'SpecialChar']},
         {name: 'vec', items:['Styles', 'Format', 'Outdent', 'Indent', 'HorizontalRule']},
-        {name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']},
+        {name: 'insert', items: ['CreateDiv', 'Table', 'IFrame', 'Youtube', 'Abbr']},
     ];
 
     /*config.toolbar = [
diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php
index c9ff9b5fc..318419784 100644
--- a/frontend/api/class.ApiLogin.php
+++ b/frontend/api/class.ApiLogin.php
@@ -1187,7 +1187,7 @@ class ApiLogin
         // Preverimo ReCaptcha
         if (AppSettings::getInstance()->getSetting('google-secret_captcha') !== false) {
             $recaptchaResponse = $this->data['g-recaptcha-response'];
-            $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $secret_captcha . '&response=' . $recaptchaResponse);
+            $requestReCaptcha = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . AppSettings::getInstance()->getSetting('google-secret_captcha') . '&response=' . $recaptchaResponse);
 
             if (!strstr($requestReCaptcha, 'true')) {
                 $error['invalid_recaptcha'] = '1';
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
index d2c3cc9de..b751434cb 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
@@ -106,6 +106,8 @@ function prijava_1ka_theme()
       'prijava_z_racuni_modal_block' => [
         'variables' => [
           'lang' => $lang,
+          'rememberMe' => (empty($_COOKIE['remember-me']) ? true : false),
+          'url_google' => $url_google
         ]
       ]
     ];
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
index 1f61d76c6..8914e5aea 100644
--- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
+++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-z-racuni-modal-block.html.twig
@@ -1,5 +1,5 @@
 {#{% if(prijavljen) %}#}
-  <div class="rexister-modal" id="modal-aai-obvestilo">
+s  <div class="rexister-modal" id="modal-other-login">
 
       <div class="modal-box"><img src="/tema1ka/img/ikone/zapri.svg" class="closemodal">
 
@@ -22,13 +22,13 @@
 
           <div class="w-clearfix">
             <div class="col _4-4-12-12">
-              <p>{{ lang['srv_gdpr_frontend_external_login'] }}</p>
+              <p>{{ lang['srv_gdpr_frontend_external_login'] | raw }}</p>
             </div>
           </div>
 
           <div class="w-clearfix">
             <div class="col _4-4-12-12">
-              <p>{{ lang['srv_gdrp_frontend_cookie'] }}</p>
+              <p>{{ lang['srv_gdrp_frontend_cookie'] | raw }}</p>
             </div>
           </div>
 
@@ -61,7 +61,7 @@
           <div>
             <div class="col w-clearfix">
               <button class="submit-btn w-button prijava-ostale-nazaj" style="float: left;">{{ lang['back'] }}</button>
-              <input type="submit" value="{{ lang['srv_custom_report_alert_yes'] }}" class="submit-btn w-button" id="submit-other-login">
+              <input type="submit" value="{{ lang['srv_custom_report_alert_yes'] }}" class="submit-btn w-button" id="submit-other-login" style="float:right;">
             </div>
           </div>
 
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
index 37014d3ce..cc2258171 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
+++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
@@ -1123,6 +1123,22 @@ body {
   font-weight: 400;
 }
 
+ul.seznam-tem {
+  ist-style: none;
+}
+ul.seznam-tem li.prirocnik {
+  padding: 13px 0px;
+  border-bottom: 1px solid #e5e5e5;
+}
+ul.seznam-tem li.prirocnik:first-child {
+  border-top: 1px solid #e5e5e5;
+}
+ul.seznam-tem li.prirocnik a {
+  color: #333333;
+  font-size: 18px;
+  font-weight: 400;
+}
+
 .modal, .rexister-modal {
   position: fixed;
   left: 0%;
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
index ec5f78743..5e57b28a5 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js
@@ -491,3 +491,142 @@ function odpriAaiLoginObvestilo(){
     jQuery('#modal-open-login-obrazec').css('display', 'flex');
   }
 }
+
+function CookieAlert(link, jezik, url) {
+  var link = link || '/';
+  var jezik = jezik || 'sl';
+  var url = url || false;
+
+  if (link == 'fb') {
+    link = '/frontend/api/api.php?action=login_facebook';
+    // link = 'https://www.1ka.si/fb_login.php';
+  }
+
+  // if (link == 'google') {
+  //   link = '/frontend/api/api.php?action=login_google';
+  // }
+
+  if (link == 'aai') {
+    link = 'https://aai.1ka.si/Shibboleth.sso/Login';
+  }
+
+  var da = 'Nadaljuj';
+  var ne = 'Prekliči';
+  if (jezik == 'en') {
+    var da = 'Continue';
+    var ne = 'Cancel';
+  }
+
+  jQuery('#kuki').dialog({
+    height: "auto",
+    width: 520,
+    dialogClass: 'pojavno-okno-1ka',
+    modal: true,
+    buttons: [{
+      text: da,
+      class: "gumbi-pri-zunanji-prijavi",
+      click: function () {
+        jQuery(this).dialog("close");
+
+        document.location.href = link;
+      }
+    }, {
+      text: ne,
+      click: function () {
+        jQuery(this).dialog("close");
+        if (url) {
+          return false;
+        }
+        else {
+          document.location.href = '/';
+        }
+
+      }
+    }]
+  });
+
+  // Če strinjanje ne obstaja, prikažemo vse gumbe
+  if(jQuery('#pogoji-strinjanje').length == 0)
+    jQuery('.gumbi-pri-zunanji-prijavi').show();
+}
+
+// Za google prijavo moramo postati formo - kar sestavimo direktno url
+/*
+		<form id="googleLoginForm" action="https://accounts.google.com/o/oauth2/auth" method="get" style="display: none;">
+            <input type="hidden" name="response_type" value="code" />
+            <input type="hidden" name="client_id" value="<?=$google_login_client_id?>" />
+            <input type="hidden" name="redirect_uri" value="https://www.1ka.si/utils/google-oauth2.php" />
+            <input type="hidden" name="state" value="<?=(isset ($_GET['regFromEnglish']) && $_GET['regFromEnglish']=="1"?'regFromEnglish':'')?>" />
+            <input type="hidden" name="scope" value="email" />
+            <input type="hidden" name="access_type" value="online" />
+            <input type="hidden" name="prompt" value="consent" />
+            <input type="hidden" name="openid.realm" value="https://www.1ka.si" />
+        </form>
+*/
+function CookieAlertGoogle(jezik, url) {
+  //console.log('sa', link, jezik);
+
+  //var link = link || '/';
+  var jezik = jezik || 'sl';
+  var url = url || false;
+
+  // Sestavimo url
+  var url = 'https://accounts.google.com/o/oauth2/auth?';
+
+  url += 'response_type=code';
+  url += '&client_id=944153399779-m39ehn45vm6b64l0sac7hphtpm0esgqs.apps.googleusercontent.com';
+  url += '&redirect_uri=https://www.1ka.si/frontend/api/google-oauth2.php';
+
+  if(jezik == 'en')
+    url += '&state=regFromEnglish';
+  else
+    url += '&state=';
+
+  url += '&scope=email';
+  url += '&access_type=online';
+  url += '&prompt=consent';
+  url += '&openid.realm=https://www.1ka.si';
+
+
+  var da = 'Nadaljuj';
+  var ne = 'Prekliči';
+  if (jezik == 'en') {
+    var da = 'Continue';
+    var ne = 'Cancel';
+  }
+
+  jQuery('#kuki').dialog({
+    height: "auto",
+    width: 520,
+    dialogClass: 'pojavno-okno-1ka',
+    modal: true,
+    buttons: [{
+      text: da,
+      class: "gumbi-pri-zunanji-prijavi",
+      click: function () {
+        jQuery(this).dialog("close");
+
+        document.location.href = url;
+      }
+    }, {
+      text: ne,
+      click: function () {
+
+        jQuery('#pogoji-strinjanje').attr('checked', false);
+        jQuery(this).dialog("close");
+
+        if (url) {
+          return false;
+        }
+        else {
+          document.location.href = '/';
+        }
+
+      }
+    }]
+  });
+
+  // Če strinjanje ne obstaja, prikažemo vse gumbe
+  if(jQuery('#pogoji-strinjanje').length == 0)
+    jQuery('.gumbi-pri-zunanji-prijavi').show();
+}
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
index 0ac2f3081..163a95c21 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
@@ -331,7 +331,7 @@
 
           jQuery('#modal-other-login #login-' + atribut + '-title').show();
           jQuery('#submit-other-login').attr('data-redirect', 'url-' + atribut);
-          jQuery('#modal-other-login').show();
+          jQuery('#modal-other-login').css('display', 'flex');
         });
 
         jQuery('#modal-other-login #submit-other-login').on('click', function () {
@@ -349,38 +349,17 @@
         /**end prijava z ostalimi računi **/
 
         // Če uporabnik ni prijavljen potem moje ankete odprejo možnost za prijavo
-        if (jQuery('[href*="/admin/survey/index.php?lang="]').length > 0 || jQuery('[data-href*="/admin/survey/index.php?lang="]').length > 0) {
-
-          // preverimo če obstaja piškot, da je uporabnik prijavljen
+        // preverimo če obstaja piškot, da je uporabnik prijavljen
           if (document.cookie.indexOf('unam=') > 0) {
-            var dataHref = jQuery('[data-href*="/admin/survey/index.php?lang="]');
 
-            if (dataHref.length > 0) {
-              dataHref.attr('href', dataHref.attr('data-href'));
-
-              jQuery('#gumb-spletna-uporaba').attr('href', dataHref.attr('data-href')).attr('id', '');
-
-              dataHref.attr('data-href', '');
-            }
-
-            var href = jQuery('[href*="/admin/survey/index.php?lang="]');
-            if (href.length > 0 && dataHref.length < 1) {
-              jQuery('#gumb-spletna-uporaba').attr('href', href.attr('href')).attr('id', '');
-            }
-
-
-            jQuery('[href*="/admin/survey/index.php?lang="]').removeClass('gumb-spletna-uporaba');
+            jQuery('[href="/d/admin/survey"]').attr('href', '/admin/survey/index.php?lang='+lang()).removeClass('gumb-spletna-uporaba');
 
           } else {
-            var href = jQuery('[href*="/admin/survey/index.php?lang="]');
 
-            if (href.length > 0) {
-              href.attr('data-href', href.attr('href')).attr('href', '#');
-            }
+            jQuery('[href="/d/admin/survey"]').attr('href', '#').addClass('gumb-spletna-uporaba');
 
-            jQuery('[data-href*="/admin/survey/index.php?lang="]').addClass('gumb-spletna-uporaba');
           }
-        }
+
 
 
         // Meni za mobilnike
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss
index c01d0ad8f..0b9217e1e 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_quicktabs.scss
@@ -56,3 +56,22 @@
   }
 
 }
+
+ul.seznam-tem{
+  ist-style: none;
+
+  li.prirocnik{
+    padding: 13px 0px;
+    border-bottom: 1px solid $siva-5;
+
+    &:first-child{
+      border-top: 1px solid $siva-5;
+    }
+
+    a{
+      color: #333333;
+      font-size: 18px;
+      font-weight: 400;
+    }
+  }
+}
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
index 40840a8f2..f7db54e9f 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--front.html.twig
@@ -294,7 +294,7 @@
     {# Gumb #}
     <div class="row flex-desna flex">
           <div class="gumb">
-              <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button shrink main-button w-inline-block" class="ustvari-anketo">
+              <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button shrink main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
                 <div class="button-label">Ustvarite anketo</div>
                 <img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" class="button-right-arrow">
                 <div class="button-flyin"></div>
@@ -356,7 +356,7 @@
     <div class="row flex">
       <div class="col c-33 gumb">
           <div class="buttons-row buttons-center" style="width: 200px">
-            <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button main-button w-inline-block">
+            <a href="{% if uporabnik %}/admin/survey{% else %}#{%  endif %}" class="button main-button w-inline-block {% if uporabnik is empty %}modal-goto-registration{% endif %}">
               <div class="button-label">Ustvarite anketo</div><img src="/tema1ka/svg/icons8-chevron-right-bela.svg" loading="lazy" alt="" class="button-right-arrow" style="transform: translate3d(0px, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d;">
               <div class="button-flyin" style="transform: translate3d(-100%, 0px, 0px) scale3d(1, 1, 1) rotateX(0deg) rotateY(0deg) rotateZ(0deg) skew(0deg, 0deg); transform-style: preserve-3d; display: block;"></div>
             </a>
diff --git a/lang/1.php b/lang/1.php
index 4255c830f..235bcd55a 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1990,12 +1990,12 @@ $lang = array (
 	"srv_settings_help"				=>	"Pomoč",
 	"srv_settingsPersonal"			=>	"Uporabni&#154;ke nastavitve",
 	"srv_nastavitveStevilcenje"			=>	"&#352;tevil&#269;enje vpra&#353;anj",
-	"srv_nastavitveStevilcenjeType"		=>	"Na&#269;in &#154;tevil&#269;enja",
+	"srv_nastavitveStevilcenjeType"		=>	"Način številčenja za respondente",
 	"srv_nastavitveStevilcenjeType0"	=>	"Brez &#154;tevil&#269;enja",
-	"srv_nastavitveStevilcenjeType1"	=>	"Z zaporedno &#353;tevilko [ 1), 2) ... ]",
+	"srv_nastavitveStevilcenjeType1"	=>	"Z zaporedno &#353;tevilko spremenljivke [ 1), 2) ... ]",
 	"srv_nastavitveStevilcenjeType2"	=>	"Z imenom spremenljivke [ V1, V2 ... ]",
-	"srv_nastavitveStevilcenjeType3"	=>	"Z imenom in zaporedno &#154;tevilko",
-	"srv_nastavitvePrestevilcevanje"	=>	"Avtomatsko preštevilčevanje",
+	"srv_nastavitveStevilcenjeType3"	=>	"Z imenom in zaporedno &#154;tevilko spremenljivke",
+	"srv_nastavitvePrestevilcevanje"	=>	"Avtomatsko preštevilčevanje vprašanj ob spreminjanju vrstnega reda vprašanj",
 	"srv_nastavitveStevilcenjePDF" =>	"O&#353;tevil&#269;i vpra&#353;anja v PDF izvozih",
 	"srv_nastavitveStevilcenjeRTF" =>	"O&#353;tevil&#269;i vpra&#353;anja v DOC (Word) izvozih",
 	"srv_nastavitveStevilcenjeFrekvence" =>	"O&#353;tevil&#269;i vpra&#353;anja v Frekvencah",
@@ -2984,8 +2984,8 @@ $lang = array (
 	"srv_podrobno_datoteke"			=>	"Datoteke",
 	"srv_pregledovanje"				=>	"Moje ankete",
 	"srv_seznam"					=>	"Seznam",
-	"srv_javne_ankete"				=>	"Javne ankete",
-	"srv_moje_ankete"				=>	"Moje ankete",
+	"srv_javne_ankete"				=>	"Dodaj anketo v javno knjižnico",
+	"srv_moje_ankete"				=>	"Dodaj anketo v mojo knjižnico",
 	"srv_javna_knjiznica"			=>	"Javna knjižnica",
 	"srv_moja_knjiznica"			=>	"Moja knjižnica",
 	"srv_javna_vprasanja"			=>	"Javna vpra&#154;anja",
@@ -3269,7 +3269,7 @@ $lang = array (
 	"srv_slideshow_sett_autostart_opt_3"	=>	"Animacijo zažene katerakoli od naštetih akcij (Gumb 'Naprej', Timer vprašanja, Klik na vprašanje)",
 	"srv_slideshow_sett_autostart_opt_3_short"	=>	"Karkoli",
 	"srv_slideshow_sett_next_button_lbl"	=>	"Prikaz gumba 'Naprej'",
-	"srv_slideshow_sett_back_button_lbl"	=>	"Prikaz gumba 'Nazaj'",
+	"srv_slideshow_sett_back_button_lbl"	=>	"Gumb 'Nazaj' je prikazan",
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Prikaz gumba 'Pavza'",
 	"srv_slideshow_sett_button_opt_0"	=>	"Ne prikaži gumba",
 	"srv_slideshow_sett_button_opt_1"	=>	"Prikaži gumb",
@@ -3298,7 +3298,7 @@ $lang = array (
     "srv_fieldwork_device_pass"     =>  "Geslo naprave",
     "srv_fieldwork_device_surveyID" =>  "ID te ankete na napravi",
     "srv_fieldwork_sync_data"       =>  "Sinhroniziraj podatke",
-    "srv_hint"							=>	"Namig",
+    "srv_hint"							=>	"Možnost namiga za respondente",
 	"srv_hint_datapiping"				=>	"Pri urejanju zaključka ali vsebini e-pošte, ki ga prejme respondent uporabite za prikaz &#353;tevila to&#269;k <b>Prenos vrednosti</b>.</p><p>Vpi&#353;ite labelo spremenljivke z izra&#269;unano vrednostjo, obdano z lojtro, npr.: <B>#rezultat#</B>",
 	"srv_missing_profile_title1"		=>	"Označeni odgovori se <font class=\"red bold\">ne</font> upoštevajo pri analizah, in se obravnavajo kot manjkajo&#269;e vrednosti!",
 	"srv_missing_profile_title2"		=>	"Manjkajoče vrednosti – neopredeljeni odgovori",
@@ -4012,12 +4012,13 @@ $lang = array (
 	"srv_add_lang"						=>	"Omogo&#269;i ve&#269;jezi&#269;no podporo v anketi",
 	"srv_prevajanje"					=>	"Prevajanje",
 	"srv_mobile_settings"				=>	"Mobilne nastavitve",
-	"srv_mobile_settings_title"			=>	"Nastavitve prikaza pri mobilnih napravah",
+	"srv_mobile_settings_title"			=>	"Prikaz ankete na mobilnih napravah",
 	"srv_mobile_survey"					=>	"Anketa ustvarjena v mobilni aplikaciji",
 	"srv_mobile_add_question"			=>	"Dodaj vprašanje",
 	"srv_standardne_besede"				=>	"Standardne besede",
 	"srv_prevajanje_dodaj"				=>	"Dodaj nov prevod za",
 	"srv_base_lang"						=>	"Osnovni jezik",
+	"srv_multi_lang"						=>	"Večjezične ankete",
 	"srv_lang_elements"					=>	"Standardne besede",
 	"srv_trans_lang"					=>	"Prevod",
 	"srv_trans_langs"					=>	"Prikaži dodatni jezik",
@@ -4580,9 +4581,9 @@ $lang = array (
 	"srv_comments_link"							=>	"Pregled komentarjev",
 	"srv_comments_user"							=>	"Uporabnik ",
 	"srv_comments_user2"						=>	" je komentiral:",
-	"srv_comments_archive"						=>	"Arhiviraj komentar",
+	"srv_comments_archive"						=>	"Razreši",
 	"srv_comments_unarchive"						=>	"Označi kot nerešeno",
-	"srv_comments_archived"						=>	"Komentar je arhiviran",
+	"srv_comments_archived"						=>	"Komentar je razrešen",
 	"srv_comments_new"							=>	"Komentiraj",
 	"srv_zanka_profile_all"						=>	"Brez",
 	"srv_zanka_profile_session"						=>	"Za&#269;asno",
@@ -4654,6 +4655,7 @@ $lang = array (
 	"srv_done"									=>	"Končano",
 	"srv_not_relevant"							=>	"Nerelevantno",
 	"srv_comment_comment"						=>	"Odgovori",
+	"srv_comment_delete"						=>	"Izbriši",
 	"srv_edit_data_title"						=>	"Uredi podatke vprašanja",
 	"srv_edit_data_row"							=>	"Uredi celotno anketo respondenta",
 	"srv_edit_data_row_quick"					=>	"Hitro urejanje celotne ankete respondenta",
@@ -6393,7 +6395,7 @@ $lang = array (
 	'srv_aapor_show_calculation'				=>	'Prikaz izračunov:',
 	'srv_aapor_show_approximate_calculation'	=>	'Prikaz približnih izračunov:',
     'srv_aapor_show_approximate'	            =>	'Prikaži približke',
-	'srv_show_continue_later'					=>	'Opcija za nadaljevanje kasneje',
+	'srv_show_continue_later'					=>	'Možnost kasnejšega nadaljevanja izpolnjevanja ankete',
 	'srv_themes_select'							=>	'Izbira teme',
 	'srv_themes_mod'							=>	'Prilagoditev teme',
 	'srv_themes_mod2'							=>	'Trenutno urejate temo',
@@ -6411,7 +6413,7 @@ $lang = array (
 	'srv_new_theme_alert'						=>	'Dodana je nova prilagoditev teme <b>%s</b>. Uredite jo lahko spodaj.',
 	'srv_new_theme_alert_css'					=>	'Dodana je nova CSS tema <b>%s</b>. Uredite jo lahko spodaj.',
 	'srv_js_tracking'							=>	'JavaScript koda za sledenje',
-	'js_tracking_note'							=>	'Skopirajte celotno kodo (iz npr. Google Analytics), vključno s &lt;script&gt; blokom.',
+	'js_tracking_note'							=>	'Vnesite celotno kodo za sledenje (iz npr. Google Analytics) - vključno s &lt;script&gt; blokom.',
 	'srv_editing_mode'							=>	'Napredna 1KA',
 	'srv_editing_mode_0'						=>	'Enostavno',
 	'srv_editing_mode_1'						=>	'Napredno',
@@ -6822,7 +6824,6 @@ $lang = array (
 	'srv_parapodatki'							=>	'Napredni parapodatki',
 	'pasteFromWordAlert'						=>	'<b>Kopiranje besedila močno odsvetujemo!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">Več >></a>',
 	'srv_interaktivni_elementi'					=>	'Interaktivni elementi',
-	'srv_hint'									=>	'Namig',
 	'srv_para_label_variables'					=>	'Spremenljivke',
 	'srv_para_label_details'					=>	'Podrobno',
 	'srv_para_label_breaks'						=>	'Prekinitve',
@@ -7126,7 +7127,7 @@ $lang = array (
 	'one_click_create'			                =>  "Enklik kreiranje",
 	'edit_hide'			                		=>  "Skrij",
 	'edit_show'			                		=>  "Prikaži",
-	'srv_show_title'			               	=>  "Naslov ankete za uporabnike",
+	'srv_show_title'			               	=>  "Naslov ankete je viden respondentom",
 	'srv_create_show_intro'			            =>  "Uvod je viden respondentom",
 	'srv_create_show_concl'			            =>  "Zaključek je viden respondentom",
 	'srv_create_show_title'			            =>  "Naslov ankete je viden respondentom",
@@ -7147,10 +7148,10 @@ $lang = array (
 	'srv_tip_sample_t6_5_v4'					=>	"alergeni",
 	'srv_tip_sample_t6_5_c1'					=>	"Najbolj pomemben",
 	'srv_tip_sample_t6_5_c2'					=>	"Najmanj pomemben",
-	'srv_settings_mobile_img'					=>	"Prikaz slik na mobilniku",
-	'srv_settings_mobile_tables'				=>	"Prilagoditev tabel na mobilniku",
+	'srv_settings_mobile_img'					=>	"Prikaz slik na mobilnih napravah",
+	'srv_settings_mobile_tables'				=>	"Prilagoditev vprašanj tipa 'Tabela' na mobilnih napravah",
 	'srv_settings_mobile_tables_slide'			=>	"Da, z razpiranjem",
-	'srv_settings_mobile_friendly'				=>	"Prilagojen prikaz za mobilnike",
+	'srv_settings_mobile_friendly'				=>	"Prilagojen prikaz ankete na mobilnih napravah",
 	'srv_settings_mobile_friendly_off'			=>	"Prilagojen prikaz za mobilnike je izklopljen",
 	'srv_mySurvey_unallocated'					=>	"Nerazporejene ankete",
 	'srv_mySurvey_delete_folder'				=>	"Pobriši mapo",
@@ -7190,7 +7191,7 @@ $lang = array (
 	'srv_orientacija_tabela_da_ne'				=>	"Tabela DA/NE",
 	'srv_privacy_0'								=>	"Brez potrditve (povezava v nogi ankete)",
 	'srv_privacy_1'								=>	"Potrditev s klikom naprej",
-	'srv_privacy_2'								=>	"Potrditev s checkboxom",
+	'srv_privacy_2'								=>	"Potrditev s potrditvenim poljem (checkbox)",
   'cookiePopupTitle'                       	=>  'Uporaba piškotkov',
   'cookiePopupText'                       	=>  '<p>Za izbolj&#154;anje uporabni&#154;ke izku&#154;nje, vam bomo kot prijavljenim uporabnikom dodelili pi&#154;kotke (<a target="_blank" href="https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-piskotkov" style="color: blue; text-decoration: underline;">pojasnilo</a>).</p><p>Ali se &#382;elite prijaviti?</p>',
   'aaiPopupTitle'                         => 'AAI-prijava',
diff --git a/lang/2.php b/lang/2.php
index da68a8ca9..ce1da4a75 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1978,12 +1978,12 @@ $lang = array (
 	"srv_settings_help"				=>	"Help",
 	"srv_settingsPersonal"			=>	"Personal setting",
 	"srv_nastavitveStevilcenje"		=>	"Question numbering",
-	"srv_nastavitveStevilcenjeType"	=>	"Numbering style",
+	"srv_nastavitveStevilcenjeType"	=>	"Numbering style for respondents",
 	"srv_nastavitveStevilcenjeType0"=>	"Without numbering",
-	"srv_nastavitveStevilcenjeType1"=>	"With consecutive numbers [ 1), 2), ... ]",
+	"srv_nastavitveStevilcenjeType1"=>	"With consecutive numbers of variables [ 1), 2), ... ]",
 	"srv_nastavitveStevilcenjeType2"=>	"With variable names [ V1, V2, ... ]",
-	"srv_nastavitveStevilcenjeType3"=>	"With names and consecutive numbers",
-	"srv_nastavitvePrestevilcevanje"=>	"Automatic renumbering",
+	"srv_nastavitveStevilcenjeType3"=>	"With names and consecutive numbers of variables",
+	"srv_nastavitvePrestevilcevanje"=>	"Automatic renumbering of questions when changing the order of questions",
 	"srv_nastavitveStevilcenjePDF" 	=>	"Numbered questions in PDF",
 	"srv_nastavitveStevilcenjeRTF" 	=>	"Numbered questions in RTF",
 	"srv_nastavitveStevilcenjeFrekvence"	=> "Numbered questions in Frequency statistics",
@@ -3239,8 +3239,8 @@ $lang = array (
 	"srv_slideshow_sett_autostart_opt_2_short"	=>	"Click on first question",
 	"srv_slideshow_sett_autostart_opt_3"	=>	"Start by any action (Button 'Forward', First question timer, Click on first question)",
 	"srv_slideshow_sett_autostart_opt_3_short"	=>	"Any action",
-	"srv_slideshow_sett_next_button_lbl"	=>	"Display 'Forward' option",
-	"srv_slideshow_sett_back_button_lbl"	=>	"Display 'Back' option",
+	"srv_slideshow_sett_next_button_lbl"	=>	"Display 'Forward' button",
+	"srv_slideshow_sett_back_button_lbl"	=>	"Display 'Back' button",
 	"srv_slideshow_sett_pause_button_lbl"	=>	"Display 'Pause' opiton",
 	"srv_slideshow_sett_button_opt_0"	=>	"Don't show button",
 	"srv_slideshow_sett_button_opt_1"	=>	"Show button",
@@ -3269,7 +3269,7 @@ $lang = array (
     "srv_fieldwork_device_pass"     =>  "Device password",
     "srv_fieldwork_device_surveyID" =>  "Survey ID on the device",
     "srv_fieldwork_sync_data"       =>  "Synchronise data",
-	"srv_hint"							=>	"Hint",
+	"srv_hint"							=>	"Hint option for respondents",
 	"srv_hint_datapiping"				=>	"When editing conclusion or email, use <b>Data piping</b> to display final score.</p><p>Use question label for computed value, embraced with hash, <B>#score#</B>",
 	"srv_missing_profile_title1"		=>	"Selected values are not used in the analysis and are treated as missing values!",
 	"srv_missing_profile_title2"		=>	"Missing values - undefined answers",
@@ -3982,10 +3982,11 @@ $lang = array (
 	"srv_prevajanje"					=>	"Translations",
 	"srv_standardne_besede"				=>	"Standard words",
 	"srv_mobile_settings"				=>	"Mobile settings",
-	"srv_mobile_settings_title"			=>	"Display settings for mobile devices",
+	"srv_mobile_settings_title"			=>	"Survey display on mobile devices",
 	"srv_mobile_survey"					=>	"Survey created with mobile app",
     "srv_mobile_add_question"			=>	"Add question",
 	"srv_prevajanje_dodaj"				=>	"Add translation for",
+	"srv_multi_lang"						=>	"Multilanguage surveys",
 	"srv_base_lang"						=>	"Basic language",
 	"srv_lang_elements"					=>	"Standard text",
 	"srv_trans_lang"					=>	"Translation",
@@ -4556,9 +4557,9 @@ $lang = array (
 	"srv_comments_anketa_resp"					=>	"Respondent comments to the survey",
 	"srv_comments_user"							=>	"User ",
 	"srv_comments_user2"						=>	" commented:",
-	"srv_comments_archive"						=>	"Archive comment",
-	"srv_comments_unarchive"						=>	"Unarchive",
-	"srv_comments_archived"						=>	"Comment has already been archived",
+	"srv_comments_archive"						=>	"Resolve",
+	"srv_comments_unarchive"						=>	"Mark as unresolved",
+	"srv_comments_archived"						=>	"Comment has been resolved",
 	"srv_comments_new"							=>	"Comment",
 	"srv_zanka_profile_all"						=>	"Without",
 	"srv_zanka_profile_session"					=>	"Temporary",
@@ -4629,6 +4630,7 @@ $lang = array (
 	"srv_done"									=>	"Done",
 	"srv_not_relevant"							=>	"Not relevant",
 	"srv_comment_comment"						=>	"Reply",
+	"srv_comment_delete"						=>	"Delete",
 	"srv_edit_data_title"						=>	"Edit question data",
 	"srv_edit_data_row"							=>	"Edit respondents survey",
 	"srv_edit_data_row_quick"					=>	"Quick edit respondents survey",
@@ -6286,7 +6288,7 @@ $lang = array (
     'srv_aapor_show_calculation'				=>	'Show calculations:',
     'srv_aapor_show_approximate_calculation'	=>	'Show approximate calculations:',
     'srv_aapor_show_approximate'	            =>	'Show approximate',
-	'srv_show_continue_later'					=>	'Display continue later option',
+	'srv_show_continue_later'					=>	'Option to continue the survey at a later date',
 	'srv_themes_select'							=>	'Theme selection',
 	'srv_themes_mod'							=>	'Theme modifiation',
 	'srv_themes_mod2'							=>	'Currently editing',
@@ -6304,7 +6306,7 @@ $lang = array (
 	'srv_new_theme_alert'						=>	'New modification theme <b>%s</b> has been added. You can edit it below.',
 	'srv_new_theme_alert_css'					=>	'New CSS theme <b>%s</b> has been added. You can edit it below.',
 	'srv_js_tracking'							=>	'JavaScript code for tracking',
-	'js_tracking_note'							=>	'Copy the entire code (e.g. from Google Analytics), including the &lt;script&gt; block.',
+	'js_tracking_note'							=>	'Enter the full tracking code (from e.g. Google Analytics), including the &lt;script&gt; block:',
 	'srv_editing_mode'							=>	'Advanced 1KA',
 	'srv_editing_mode_0'						=>	'Basic',
 	'srv_editing_mode_1'						=>	'Advanced',
@@ -6704,7 +6706,6 @@ $lang = array (
 	'srv_parapodatki'							=>	'Advanced paradata',
 	'pasteFromWordAlert'						=>	'<b>Text copying is strongly discouraged!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">More >></a>',
 	'srv_interaktivni_elementi'					=>	'Interactive elements',
-	'srv_hint'									=>	'Hint',
 	'srv_para_label_variables'					=>	'Variables',
 	'srv_para_label_details'					=>	'Details',
 	'srv_para_label_breaks'						=>	'Breaks',
@@ -7009,7 +7010,7 @@ $lang = array (
 	'one_click_create'			                =>  "Oneclick create",
 	'edit_hide'			                		=>  "Hide",
 	'edit_show'			                		=>  "Show",
-	'srv_show_title'			               	=>  "Survey title for respondents",
+	'srv_show_title'			               	=>  "Survey title is visible to respondents",
 	'srv_create_show_intro'			            =>  "Intro is visible to respondents",
 	'srv_create_show_concl'			            =>  "Conclusion is visible to respondents",
 	'srv_create_show_title'			            =>  "Title is visible to respondents",
@@ -7031,9 +7032,9 @@ $lang = array (
 	'srv_tip_sample_t6_5_c1'					=>	"Most important",
 	'srv_tip_sample_t6_5_c2'					=>	"Least important",
 	'srv_settings_mobile_img'					=>	"Display images on mobile devices",
-	'srv_settings_mobile_tables'				=>	"Adjusted tables on mobile devices",
+	'srv_settings_mobile_tables'				=>	"Optimization of 'Table' type questions on mobile devices",
 	'srv_settings_mobile_tables_slide'			=>	"Yes, with expanding",
-	'srv_settings_mobile_friendly'				=>	"Mobile friendly",
+	'srv_settings_mobile_friendly'				=>	"Optimized survey display on mobile devices",
 	'srv_settings_mobile_friendly_off'			=>	"Mobile friendly survey is turned off",
 	'srv_mySurvey_unallocated'					=>	"Unallocated survey",
 	'srv_mySurvey_delete_folder'				=>	"Deleter folder",
@@ -7072,7 +7073,7 @@ $lang = array (
 	'srv_select_box_vse'						=>	"all",
 	'srv_orientacija_tabela_da_ne'				=>	"Table YES/NO",
 	'srv_privacy_0'								=>	"Without confirmation (link in footer)",
-	'srv_privacy_1'								=>	"Confirmation with button next",
+	'srv_privacy_1'								=>	"Confirmation with 'Next' button",
 	'srv_privacy_2'								=>	"Confirmation with checkbox",
 	'cookiePopupTitle'                       	=>  'Cookie usage',
   'cookiePopupText'                      		=>  '<p>This site uses cookies to improve user experience for logged in users.</p><p>Do you wish to proceed?</p>',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 586ad8417..c8dfd4e21 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9695,13 +9695,6 @@ div.button_holder.float-right button {
   margin-left: 16px;
   margin-right: 0;
 }
-div.button_holder.editor_button_holder {
-  margin: 0;
-  padding: 8px 16px;
-  border-bottom: 1px rgb(204, 204, 204) solid;
-  border-left: 1px rgb(204, 204, 204) solid;
-  border-right: 1px rgb(204, 204, 204) solid;
-}
 
 label {
   cursor: pointer;
@@ -10000,6 +9993,9 @@ textarea {
 textarea.wauto {
   width: auto;
 }
+textarea.w800 {
+  width: 800px;
+}
 textarea.disabled {
   border-color: #C4C4C4;
   background-color: #E5E5E5;
@@ -10449,6 +10445,33 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
   color: #FFC700 !important;
 }
 
+.cke_1.cke_chrome {
+  border-bottom: 1px #E5E5E5 solid !important;
+  border-radius: 2px 2px 0 0;
+}
+
+#cke_1_top {
+  border-bottom: 1px #E5E5E5 solid;
+}
+
+.cke_dialog {
+  border: 1px #E5E5E5 solid !important;
+}
+
+div.button_holder.editor_button_holder {
+  margin: 0;
+  padding: 8px 16px;
+  border-bottom: 1px rgb(204, 204, 204) solid;
+  border-left: 1px rgb(204, 204, 204) solid;
+  border-right: 1px rgb(204, 204, 204) solid;
+  border-radius: 0 0 2px 2px;
+}
+
+.cke_dialog table tr td,
+.cke_dialog table tr th {
+  border-bottom: 0 !important;
+}
+
 /* 
     Specific pages scss
 */
@@ -24777,83 +24800,164 @@ div.page_komentarji_anketa div.komentarji_anketa_holder {
   margin-top: 32px;
   display: flex;
   flex-direction: row;
-  gap: 32px;
   width: 100%;
 }
 div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa,
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa {
   width: 50%;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset {
-  padding: 32px 24px;
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa.komentarji_ured,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa.komentarji_ured {
+  border-right: 1px solid #E5E5E5;
+  padding-right: 32px;
+  margin-right: 32px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.add_comment_toggle {
+  transition: 0.3s;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  width: 100%;
+  padding: 9px 8px;
+  margin-bottom: 16px;
+  color: #777777;
+  cursor: text;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_type,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_type {
+  font-weight: 600;
+  margin-bottom: 16px;
+  text-transform: uppercase;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_type .fa-sort-amount-up,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_type .fa-sort-amount-up {
+  display: none;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box {
   width: 100%;
   display: flex;
   flex-direction: column;
   border-bottom: 1px solid #E5E5E5;
   margin-bottom: 16px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by {
-  margin-bottom: 4px;
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box.archived,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box.archived {
+  color: #777777 !important;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by .user,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .by .user {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .user {
   font-weight: 600;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .date,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .date {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by p {
+  font-size: 14px !important;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options {
+  display: flex;
+  flex-direction: row;
+  color: #1E88E5;
+  position: relative;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .solve,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .solve {
+  margin-right: 16px;
+  cursor: pointer;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown {
+  position: absolute;
+  right: 0;
+  top: 24px;
+  display: flex;
+  z-index: 99;
+  width: auto;
+  padding: 20px 16px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  flex-direction: column;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line {
+  white-space: nowrap;
+  transition: 0.2s;
+  cursor: pointer;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:not(:last-of-type),
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:not(:last-of-type) {
+  margin-bottom: 12px;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:hover,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line:hover {
+  color: #0059ab;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line a,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line a {
+  white-space: nowrap;
+  text-decoration: none;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .by .options .options_dropdown .line p {
+  font-size: 14px !important;
+}
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .date,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .date {
   font-size: 14px;
   color: #808080;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .content {
   margin: 16px 0;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
   margin-bottom: 16px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archive_comment,
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .unarchive_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archive_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .unarchive_comment {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archive_comment,
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .unarchive_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archive_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .unarchive_comment {
   cursor: pointer;
   color: #1E88E5;
   transition: 0.2s;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archived_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .bottom_options .archived_comment {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archived_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_box .bottom_options .archived_comment {
   color: #808080;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle {
-  transition: 0.3s;
-}
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper {
   display: none;
   transition: 0.3s;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment {
   display: flex;
   flex-direction: column;
+  margin-bottom: 16px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment textarea {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment textarea,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment textarea {
   width: 100%;
   height: 100px;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment button,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_wrapper div.new_comment button {
+div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment button,
+div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa div.comment_wrapper div.new_comment button {
   width: fit-content;
   margin-top: 8px;
 }
@@ -24989,11 +25093,29 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment.e
   padding-right: 62px;
   margin-right: 62px;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.add_comment_toggle,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.add_comment_toggle {
+  transition: 0.3s;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  width: 100%;
+  padding: 9px 8px;
+  margin-bottom: 16px;
+  color: #777777;
+  cursor: text;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_type,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_type {
   font-weight: 600;
   margin-bottom: 16px;
   text-transform: uppercase;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_type .fa-sort-amount-up,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_type .fa-sort-amount-up {
+  display: none;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box {
@@ -25003,14 +25125,73 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
   border-bottom: 1px solid #E5E5E5;
   margin-bottom: 16px;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box.archived,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box.archived {
+  color: #777777 !important;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by {
-  margin-bottom: 4px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .user,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .user {
   font-weight: 600;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by p,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by p {
+  font-size: 14px !important;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options {
+  display: flex;
+  flex-direction: row;
+  color: #1E88E5;
+  position: relative;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .solve,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .solve {
+  margin-right: 16px;
+  cursor: pointer;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown {
+  position: absolute;
+  right: 0;
+  top: 24px;
+  display: flex;
+  z-index: 99;
+  width: auto;
+  padding: 20px 16px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  flex-direction: column;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line {
+  white-space: nowrap;
+  transition: 0.2s;
+  cursor: pointer;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:not(:last-of-type),
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:not(:last-of-type) {
+  margin-bottom: 12px;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:hover,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line:hover {
+  color: #0059ab;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line a,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line a {
+  white-space: nowrap;
+  text-decoration: none;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .by .options .options_dropdown .line p {
+  font-size: 14px !important;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .date,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .date {
   font-size: 14px;
@@ -25020,6 +25201,22 @@ div.page_komentarji ul div.question_comment_holder div.question_comment div.comm
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content {
   margin: 16px 0;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote {
+  font-size: 14px !important;
+  border-left: 1px solid #E5E5E5;
+  padding-left: 8px;
+  margin-block-start: 0;
+  margin-block-end: 0;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type),
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:not(:last-of-type) {
+  padding-bottom: 16px;
+}
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:first-of-type,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .content blockquote:first-of-type {
+  margin-top: 16px;
+}
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options {
   display: flex;
@@ -25076,6 +25273,10 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
   width: fit-content;
   margin-top: 8px;
 }
+div.page_komentarji ul div.question_comment_holder div.question_comment .new_comment,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment .new_comment {
+  margin-bottom: 16px;
+}
 
 #placeholder.komentarji {
   margin: 0px;
diff --git a/resources/sass/admin_new/components/ckeditor/ckeditor.scss b/resources/sass/admin_new/components/ckeditor/ckeditor.scss
new file mode 100644
index 000000000..4fb4530c9
--- /dev/null
+++ b/resources/sass/admin_new/components/ckeditor/ckeditor.scss
@@ -0,0 +1,29 @@
+
+.cke_1.cke_chrome {
+    border-bottom: 1px $gray solid !important;
+    border-radius: 2px 2px 0 0;
+}
+
+#cke_1_top{
+    border-bottom: 1px $gray solid;
+}
+
+.cke_dialog{
+    border: 1px $gray solid !important;
+}
+
+div.button_holder.editor_button_holder{
+    margin: 0;
+    padding: 8px 16px; 
+
+    border-bottom: 1px rgb(204, 204, 204) solid;
+    border-left: 1px rgb(204, 204, 204) solid;
+    border-right: 1px rgb(204, 204, 204) solid;
+
+    border-radius: 0 0 2px 2px;
+}
+
+.cke_dialog table tr td,
+.cke_dialog table tr th{
+    border-bottom: 0 !important;
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/components/components.scss b/resources/sass/admin_new/components/components.scss
index 1af8621b0..0b6cf5c9a 100644
--- a/resources/sass/admin_new/components/components.scss
+++ b/resources/sass/admin_new/components/components.scss
@@ -15,4 +15,7 @@
 @import "table/table";
 
 // Payments
-@import "payments/payments";
\ No newline at end of file
+@import "payments/payments";
+
+// CKEditor
+@import "ckeditor/ckeditor";
\ No newline at end of file
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index de4421b06..03ec804d9 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -234,13 +234,4 @@ div.button_holder {
             margin-right: 0;
         }
     }
-
-    &.editor_button_holder{
-        margin: 0;
-        padding: 8px 16px; 
-
-        border-bottom: 1px rgb(204, 204, 204) solid;
-        border-left: 1px rgb(204, 204, 204) solid;
-        border-right: 1px rgb(204, 204, 204) solid;
-    }
 }
diff --git a/resources/sass/admin_new/components/form/textarea.scss b/resources/sass/admin_new/components/form/textarea.scss
index 0ce88cbf6..be72e9e56 100644
--- a/resources/sass/admin_new/components/form/textarea.scss
+++ b/resources/sass/admin_new/components/form/textarea.scss
@@ -5,6 +5,9 @@ textarea {
     &.wauto {
         width: auto;
     }
+    &.w800{
+        width: 800px;
+    }
 
     border: 1px solid $dark-gray;
     box-sizing: border-box;
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 266a1fc75..418570e53 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -54,90 +54,183 @@ div.page_komentarji_anketa {
         margin-top: 32px;
         display: flex;
         flex-direction: row;
-        gap: 32px;
         width: 100%;
 
         div.komentarji_anketa {
             width: 50%;
 
-            fieldset {
-                padding: 32px 24px;
+            &.komentarji_ured {
+                border-right: 1px solid $gray;
+                padding-right: 32px;
+                margin-right: 32px;
+            }
+
+            div.add_comment_toggle {
+                transition: 0.3s;
+
+                border: 1px solid $gray;
+                border-radius: 2px;
+                width: 100%;
+                padding: 9px 8px;
+                margin-bottom: 16px;
+                color: $very-dark-gray;
+
+                cursor: text;
+            }
+
+            div.comment_type {
+                font-weight: $semi-bold;
+                margin-bottom: 16px;
+                text-transform: uppercase;
+
+                display: flex;
+                flex-direction: row;
+                justify-content: space-between;
+
+                .fa-sort-amount-up {
+                    display: none;
+                }
+            }
+
+            div.comment_box {
+                width: 100%;
+                display: flex;
+                flex-direction: column;
+
+                border-bottom: 1px solid $gray;
+
+                margin-bottom: 16px;
+
+                &.archived {
+                    color: $very-dark-gray !important
+                }
+
+                .by {
+                    .user {
+                        font-weight: $semi-bold;
+                    }
+
+                    p {
+                        font-size: 14px !important;
+                    }
 
-                div.comment_box {
-                    width: 100%;
                     display: flex;
-                    flex-direction: column;
+                    flex-direction: row;
+                    justify-content: space-between;
 
-                    border-bottom: 1px solid $gray;
-
-                    margin-bottom: 16px;
-
-                    .by {
-                        margin-bottom: 4px;
-                        .user {
-                            font-weight: $semi-bold;
-                        }
-                    }
-
-                    .date {
-                        font-size: 14px;
-                        color: $very-dark-gray2;
-                    }
-
-                    .content {
-                        margin: 16px 0;
-                    }
-
-                    .bottom_options {
+                    .options {
                         display: flex;
                         flex-direction: row;
-                        justify-content: space-between;
-                        align-items: center;
-                        margin-bottom: 16px;
-
-                        .archive_comment,
-                        .unarchive_comment {
-
+                        .solve {
+                            margin-right: 16px;
                             cursor: pointer;
-                            color: $blue;
+                        }
 
-                            transition: 0.2s;
-                            &:hover {
-                                $color: darken ($blue, 3%);
+                        color: $blue;
+
+                        position: relative;
+
+                        .options_dropdown {
+                            position: absolute;
+                            right:0;
+                            top: 24px;
+
+                            display: flex;
+
+                            z-index: 99;
+
+                            width: auto;
+                            padding: 20px 16px;
+                            background: $white;
+                            border: 1px solid $gray;
+                            
+                            box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+
+                            flex-direction: column;
+
+                            .line {
+                                &:not(:last-of-type) {
+                                    margin-bottom: 12px;
+                                }
+
+                                white-space: nowrap;
+
+                                transition: 0.2s;
+
+                                &:hover{
+                                    color: $dark-blue;
+                                }
+
+                                cursor: pointer;
+
+                                a {
+                                    white-space: nowrap;
+                                    text-decoration: none;
+                                }
+
+                                p {
+                                    font-size: 14px !important;
+                                }
                             }
                         }
-
-                        .archived_comment {
-                            color: $very-dark-gray2
-                        }
                     }
                 }
 
-                div.add_comment_toggle {
-                    transition: 0.3s;
+                .date {
+                    font-size: 14px;
+                    color: $very-dark-gray2;
                 }
 
-                div.comment_wrapper {
-                    display: none;
-                    transition: 0.3s;
+                .content {
+                    margin: 16px 0;
+                }
 
-                    div.new_comment {
-                        display: flex;
-                        flex-direction: column;
-    
-                        textarea {
-                            width: 100%;
-                            height: 100px;
-                        }
-    
-                        button {
-                            width: fit-content;
-                            margin-top: 8px;
+                .bottom_options {
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    align-items: center;
+                    margin-bottom: 16px;
+
+                    .archive_comment,
+                    .unarchive_comment {
+
+                        cursor: pointer;
+                        color: $blue;
+
+                        transition: 0.2s;
+                        &:hover {
+                            $color: darken ($blue, 3%);
                         }
                     }
-                }
 
+                    .archived_comment {
+                        color: $very-dark-gray2
+                    }
+                }
             }
+
+            div.comment_wrapper {
+                display: none;
+                transition: 0.3s;
+
+                div.new_comment {
+                    display: flex;
+                    flex-direction: column;
+                    margin-bottom: 16px;
+
+                    textarea {
+                        width: 100%;
+                        height: 100px;
+                    }
+
+                    button {
+                        width: fit-content;
+                        margin-top: 8px;
+                    }
+                }
+            }
+
         }
     }
 
@@ -269,10 +362,31 @@ div.page_komentarji_anketa {
                     margin-right: 62px;
                 }
 
+                div.add_comment_toggle {
+                    transition: 0.3s;
+
+                    border: 1px solid $gray;
+                    border-radius: 2px;
+                    width: 100%;
+                    padding: 9px 8px;
+                    margin-bottom: 16px;
+                    color: $very-dark-gray;
+
+                    cursor: text;
+                }
+
                 div.comment_type {
                     font-weight: $semi-bold;
                     margin-bottom: 16px;
                     text-transform: uppercase;
+
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+
+                    .fa-sort-amount-up {
+                        display: none;
+                    }
                 }
 
                 div.comment_box {
@@ -284,11 +398,80 @@ div.page_komentarji_anketa {
 
                     margin-bottom: 16px;
 
+                    &.archived {
+                        color: $very-dark-gray !important
+                    }
+
                     .by {
-                        margin-bottom: 4px;
                         .user {
                             font-weight: $semi-bold;
                         }
+
+                        p {
+                            font-size: 14px !important;
+                        }
+
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: space-between;
+
+                        .options {
+                            display: flex;
+                            flex-direction: row;
+                            .solve {
+                                margin-right: 16px;
+                                cursor: pointer;
+                            }
+
+                            color: $blue;
+
+                            position: relative;
+
+                            .options_dropdown {
+                                position: absolute;
+                                right:0;
+                                top: 24px;
+
+                                display: flex;
+
+                                z-index: 99;
+
+                                width: auto;
+                                padding: 20px 16px;
+                                background: $white;
+                                border: 1px solid $gray;
+                                
+                                box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+
+                                flex-direction: column;
+
+                                .line {
+                                    &:not(:last-of-type) {
+                                        margin-bottom: 12px;
+                                    }
+
+                                     white-space: nowrap;
+
+
+                                    transition: 0.2s;
+
+                                    &:hover{
+                                        color: $dark-blue;
+                                    }
+
+                                    cursor: pointer;
+
+                                    a {
+                                        white-space: nowrap;
+                                        text-decoration: none;
+                                    }
+
+                                    p {
+                                        font-size: 14px !important;
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     .date {
@@ -298,6 +481,22 @@ div.page_komentarji_anketa {
 
                     .content {
                         margin: 16px 0;
+
+                        blockquote {
+                            font-size: 14px !important;
+                            border-left: 1px solid $gray;
+                            padding-left: 8px;
+
+                            margin-block-start: 0;
+                            margin-block-end: 0;
+
+                            &:not(:last-of-type) {
+                                padding-bottom: 16px;
+                            }
+                            &:first-of-type {
+                                margin-top: 16px;
+                            }
+                        }
                     }
 
                     .bottom_options {
@@ -354,6 +553,10 @@ div.page_komentarji_anketa {
                         margin-top: 8px;
                     }
                 }
+
+                .new_comment {
+                    margin-bottom: 16px;
+                }
             }
         }
     }