diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 73a9b964a..0b156a776 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -6763,48 +6763,30 @@ class SurveyAdminSettings {
 		$sas = new SurveyAdminSettings();
 		$comment_count = $sas->testiranje_komentarji_count();
 
-		echo '<div id="additional_navigation">';
-		echo '<div id="komentarji_menu">';
+		echo '<div id="komentarji_top">';
+		echo '<div id="komentarji_list">';
 
 		// Komentarji na vprasanja
-		echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
+		$question_comment_link = 'window.location.href=\'index.php?anketa=' . $this->anketa . '&amp;a=' . A_KOMENTARJI_ANKETA . '\'; return false;';
 
-		echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
+		echo '<div class="list_item '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'active' : '').'" onclick="'.$question_comment_link.'">';
 		echo $lang['srv_testiranje_komentarji_anketa_title'];
-		echo '</a>';
-
-		echo '<span class="bold">(';
-		if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
-			echo '<span class="orange">';
-		echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
-		if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
-			echo '</span>';
-		echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']);
-		echo ')</span>';
-
-		echo '</span>';
+		echo ' (' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //rešeni
+		echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']) . ')'; //vsi
+		echo '</div>';
 
 
 		// Komentarji na anketo
-		echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
-
-		echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
+		$survey_comment_link = 'window.location.href=\'index.php?anketa=' . $this->anketa . '&amp;a=' . A_KOMENTARJI . '\'; return false;';
+		
+		echo '<div class="list_item '.($_GET['a'] == A_KOMENTARJI ? ' active' : '').'" onclick="'.$survey_comment_link.'">';
 		echo $lang['srv_testiranje_komentarji_title'];
-		echo '</a>';
-
-		echo '<span class="bold">(';
-		if ($comment_count['question']['unresolved'] > 0)
-			echo '<span class="orange">';
-		echo $comment_count['question']['unresolved'];
-		if ($comment_count['question']['unresolved'] > 0)
-			echo '</span>';
-		echo '/' . $comment_count['question']['all'];
-		echo ')</span>';
-
-		echo '</span>';
+		echo ' (' . $comment_count['question']['unresolved'];
+		echo '/' . $comment_count['question']['all'] . ')';
+		echo '</div>';
 
 
-		echo '</div>'; //#menu
+		echo '</div>'; //#komentarji_list
 
 		//Link na nastavitev komentarjev
 		$d = new Dostop();
@@ -6814,7 +6796,7 @@ class SurveyAdminSettings {
                 echo '<div id="analiza_right_options_holder" class="right_options_holder">';
 
                 echo '<div title="' . $lang['settings'] . '" id="analiza_right_options">';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
                 echo '<span class="faicon wheel_32"></span>';
                 echo '</a>';
                 echo '</div>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4f66943e2..55057d9e2 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -25026,14 +25026,35 @@ div#srv_diagnostic .button_holder button {
   margin: 0 0 0 8px;
 }
 
-div.page_komentarji #additional_navigation,
-div.page_komentarji_anketa #additional_navigation {
+div.page_komentarji #komentarji_top,
+div.page_komentarji_anketa #komentarji_top {
   display: flex;
   justify-content: center;
+  margin-bottom: 16px;
 }
-div.page_komentarji #additional_navigation #komentarji_menu,
-div.page_komentarji_anketa #additional_navigation #komentarji_menu {
+div.page_komentarji #komentarji_top #komentarji_list,
+div.page_komentarji_anketa #komentarji_top #komentarji_list {
   width: fit-content;
+  display: flex;
+  flex-direction: row;
+}
+div.page_komentarji #komentarji_top #komentarji_list .list_item,
+div.page_komentarji_anketa #komentarji_top #komentarji_list .list_item {
+  cursor: pointer;
+  height: 25px;
+  min-width: 175px;
+  padding: 0 16px;
+  margin-right: 16px;
+  text-align: center;
+  color: #A0A0A0;
+  border-bottom: 1px #E5E5E5 solid;
+  transition: 0.2s;
+}
+div.page_komentarji #komentarji_top #komentarji_list .list_item.active, div.page_komentarji #komentarji_top #komentarji_list .list_item:hover,
+div.page_komentarji_anketa #komentarji_top #komentarji_list .list_item.active,
+div.page_komentarji_anketa #komentarji_top #komentarji_list .list_item:hover {
+  color: #1E88E5;
+  border-bottom: 1px #1E88E5 solid;
 }
 div.page_komentarji div#comment_question_note,
 div.page_komentarji_anketa div#comment_question_note {
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index e24d26457..b9bc0a784 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -2,12 +2,37 @@ div.page_komentarji,
 div.page_komentarji_anketa {
 
     //Meni zgoraj
-    #additional_navigation {
+    #komentarji_top {
         display: flex;
         justify-content: center;
+        margin-bottom: 16px;
 
-        #komentarji_menu {
+        #komentarji_list {
             width: fit-content;
+            display: flex;
+            flex-direction: row;
+
+            .list_item{
+                cursor: pointer;
+
+                height: 25px;
+                min-width: 175px;
+                padding: 0 16px;
+                margin-right: 16px;
+
+                text-align: center;
+                color: #A0A0A0;
+
+                border-bottom: 1px $gray solid;
+
+                transition: 0.2s;
+
+                &.active,
+                &:hover{
+                    color: $blue;
+                    border-bottom: 1px $blue solid;
+                }
+            }
         }
     }