diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 23fd297a6..7031a702f 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -7016,22 +7016,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 +7065,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 +7097,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,41 +7179,33 @@ class SurveyAdminSettings {
 			}
 		}
 
-		// 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>';
-
-		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]'");
@@ -7199,48 +7213,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>';
 
 			}
@@ -7255,7 +7286,7 @@ 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 $lang['srv_add_comment_toggle'];
 		echo '</div>';
@@ -7266,9 +7297,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
@@ -7534,32 +7564,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;
@@ -7696,6 +7700,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>';
 
@@ -7980,6 +7987,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 = " ";
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 37f91c6a1..6e66ed88b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24770,91 +24770,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;
-  border: 1px solid #E5E5E5;
-  border-radius: 2px;
-  width: 100%;
-  padding: 9px 8px;
-  color: #777777;
-  margin-bottom: 16px;
-  cursor: text;
-}
-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;
 }
@@ -25068,6 +25141,7 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
 }
 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;
 }
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index b2c675678..418570e53 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -54,100 +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;
+                }
 
-                    border: 1px solid $gray;
-                    border-radius: 2px;
-                    width: 100%;
-                    padding: 9px 8px;
-                    color: $very-dark-gray;
+                .content {
+                    margin: 16px 0;
+                }
+
+                .bottom_options {
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    align-items: center;
                     margin-bottom: 16px;
 
-                    cursor: text;
-                }
+                    .archive_comment,
+                    .unarchive_comment {
 
-                div.comment_wrapper {
-                    display: none;
-                    transition: 0.3s;
+                        cursor: pointer;
+                        color: $blue;
 
-                    div.new_comment {
-                        display: flex;
-                        flex-direction: column;
-                        margin-bottom: 16px;
-    
-                        textarea {
-                            width: 100%;
-                            height: 100px;
-                        }
-    
-                        button {
-                            width: fit-content;
-                            margin-top: 8px;
+                        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;
+                    }
+                }
+            }
+
         }
     }
 
@@ -367,6 +450,9 @@ div.page_komentarji_anketa {
                                         margin-bottom: 12px;
                                     }
 
+                                     white-space: nowrap;
+
+
                                     transition: 0.2s;
 
                                     &:hover{