diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 46699149b..deb4c1a9c 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -571,10 +571,6 @@ class SurveyDiagnostics
 		echo '</div>'; #lastnosti_wrapper
 
 
-		/////////////////////////////////////////////////////////////////////// Lastnosti staro
-
-		echo '</div>';
-
 		// KOMENATRJI
 		# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished		
 		$commentsUserUnresolved = $commentsUser - $commentsUserFinished;
@@ -586,36 +582,52 @@ class SurveyDiagnostics
 				+(int)$commentsUserFinished
 				) > 0 ) { 
 			
-			echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
-			echo '<table class="srv_diagnostic_results">';
-			echo '<tr>';
-			echo '<th>'.$lang['srv_diagnostic_4_element_0'].'</th>';
-			echo '<th>'.$lang['srv_diagnostic_unresolved'].'</th>';
-			echo '<th>'.$lang['srv_diagnostic_all'].'</th>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_1'].'</td>';
-			echo '<td>'.(int)$commentsUnresolved.'</td>';
-			echo '<td>'.(int)$commentsAll.'</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_1a'].'</td>';
-			echo '<td>'.(int)$commentsUserSurveyUnresolved.'</td>';
-			echo '<td>'.(int)$commentsUserSurveyAll.'</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_6'].'</td>';
-			echo '<td>'.(int)$commentsQuestionUnresolved.'</td>';
-			echo '<td>'.(int)$commentsQuestionAll.'</td>';
-			echo '</tr>';
-			echo '<tr>';
-			echo '<td>'.$lang['srv_diagnostic_4_element_7'].'</td>';
-			echo '<td>'.(int)$commentsUserUnresolved.'</td>';
-			echo '<td>'.(int)$commentsUser.'</td>';
-			echo '</tr>';
-			echo '</table>';
-		}
-		
+					echo '<h2>'.$lang['srv_diagnostic_4_element_0'].'</h2>';
+
+					echo '<div class="komentarji_wrapper">';
+					
+					echo '<div class="komentarji_left">';
+					echo '<div class="title">'.$lang['srv_testiranje_komentarji_anketa'].'</div>';
+					
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_admin_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsUnresolved.'/'.(int)$commentsAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsUserSurveyUnresolved.'/'.(int)$commentsUserSurveyAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					$b = new Branching($this->anketa['id']);
+
+					$id = $b->anketa;
+
+					echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji_anketa">'.$lang['srv_testiranje_komentarji_anketa_link'].'</a>';	
+
+					echo '</div>'; #komentarji_left
+					
+					
+					echo '<div class="komentarji_right">';
+					echo '<div class="title">'.$lang['srv_testiranje_komentarji_title'].'</div>';
+
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_admin_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsQuestionUnresolved.'/'.(int)$commentsQuestionAll.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					echo '<div class="comment_count">';
+					echo '<div>'.$lang['srv_repondent_comment2'].'</div>';
+					echo '<div><span class="semi-bold">'.(int)$commentsUserUnresolved.'/'.(int)$commentsUser.'</span> '.$lang['srv_inv_archive_comment2'].'</div>';
+					echo '</div>';
+
+					echo '<a href="'.$site_url.'/admin/survey/index.php?anketa='.$id.'&a=komentarji">'.$lang['srv_testiranje_komentarji_title_link'].'</a>';	
+
+					echo '</div>'; #komentarji_right
+
+					echo '</div>'; #komentarji_wrapper
+				}
+
 		echo '</div>'; # id="srv_diagnostic"
 	}
 	
diff --git a/lang/1.php b/lang/1.php
index 7aeb94f63..670fa9ae6 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -3593,7 +3593,9 @@ $lang = array (
 	"srv_forum_go"					=>	"Ogled celotne teme v forumu",
 	"srv_forum_back"				=>	"Nazaj na urejanje ankete",
 	"srv_admin_comment"				=>	"Komentarji urednikov",
+	"srv_admin_comment2"				=>	"Urednikov",
 	"srv_repondent_comment"			=>	"Komentarji respondentov",
+	"srv_repondent_comment2"			=>	"Respondentov",
 	"srv_add_comment_toggle"				=>	"Dodaj nov komentar",
 	"srv_add_comment"				=>	"Dodaj komentar",
 	"srv_view_comment"				=>	"Poglej komentarje",
@@ -5146,6 +5148,7 @@ $lang = array (
 	'srv_inv_archive_cnt_succsess' 				=> "Uspešno poslanih",									
 	'srv_inv_archive_cnt_error' 				=> "Napak",									
 	'srv_inv_archive_comment' 					=> "Komentar",									
+	'srv_inv_archive_comment2' 					=> "komentarjev",									
 	'srv_inv_archive_sender' 					=> "Poslal/-a",
 	'srv_inv_archive_email_address' 			=> "Email prejemnika",
 	'srv_inv_archive_status' 					=> "Status",
@@ -5372,7 +5375,9 @@ $lang = array (
 	"srv_testiranje_diagnostika_base"			=>	"Osnovna diagnostika",
 	"srv_testiranje_komentarji"					=>	"Komentarji",
 	"srv_testiranje_komentarji_anketa"			=>	"Komentarji na anketo",
+	"srv_testiranje_komentarji_anketa_link"			=>	"Oglej si komentarje na anketo",
 	"srv_testiranje_komentarji_title"			=>	"Komentarji na vprašanja",			
+	"srv_testiranje_komentarji_title_link"			=>	"Oglej si komentarje na vprašanja",			
 	"srv_testiranje_komentar_q_title"			=>	"Komentar na vprašanje",			
 	"srv_testiranje_komentar_q_all_title"		=>	"Komentarji na vprašanje",			
 	"srv_testiranje_komentar_q_resp_all_title"	=>	"Komentarji respondentov na vprašanje",			
diff --git a/lang/2.php b/lang/2.php
index 3e0cacf74..07a83964a 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4002,7 +4002,9 @@ $lang = array (
 	"srv_collectData"					=>	"Data preparation",			
 	"srv_testiranje_komentarji"			=>	"Comments",		
 	"srv_testiranje_komentarji_anketa"	=>	"Survey comments",	
+	"srv_testiranje_komentarji_anketa_link"	=>	"View survey comments",	
 	"srv_testiranje_komentarji_title"			=>	"Question comments",	
+	"srv_testiranje_komentarji_title_link"			=>	"View question comments",	
 	"srv_testiranje_komentar_q_title"			=>	"Question comment",			
 	"srv_testiranje_komentar_q_all_title"		=>	"Question comments",			
 	"srv_testiranje_komentar_q_resp_all_title"	=>	"Respondnet question comments",			
@@ -5115,6 +5117,7 @@ $lang = array (
 	'srv_inv_archive_cnt_succsess' 				=> "Successfully sent",									
 	'srv_inv_archive_cnt_error' 				=> "Errors",									
 	'srv_inv_archive_comment' 					=> "Comment",									
+	'srv_inv_archive_comment2' 					=> "comments",									
 	'srv_inv_archive_sender' 					=> "Sender",
 	'srv_inv_archive_email_address' 			=> "Respondent email",
 	'srv_inv_archive_status' 					=> "Status",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4c68862ed..b3272c12d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24216,78 +24216,79 @@ div#srv_diagnostic table td div.status_wrapper div.status a {
   color: inherit;
   text-decoration: none;
 }
-div#srv_diagnostic div.lastnosti_wrapper {
+div#srv_diagnostic .lastnosti_wrapper {
   display: flex;
   flex-direction: row;
   align-items: space-between;
   gap: 32px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle {
   width: 33%;
   display: flex;
   flex-direction: column;
   gap: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
   padding: 16px;
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
+  min-height: 162px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .title,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .title {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .title,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .title {
   text-transform: uppercase;
   font-weight: 600;
   margin-bottom: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph {
   display: flex;
   flex-direction: row;
   margin-top: -8px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .circle,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .circle {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .circle,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .circle {
   height: 88px;
   width: 88px;
   margin-right: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text {
   display: flex;
   flex-direction: column;
   justify-content: center;
   gap: 16px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .diagnostic_graph .other_text a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .diagnostic_graph .other_text a {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text a,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time {
-  font-size: 40px;
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time {
+  font-size: 32px;
   margin-bottom: 12px;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box .time span.time_text,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box .time span.time_text {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .time span.time_text,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .time span.time_text {
   font-size: 14px !important;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left .box a,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_middle .box a {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box a,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box a {
   text-decoration: none;
   font-size: 14px !important;
   white-space: nowrap;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right {
   width: 33%;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box {
   border: 1px solid #E5E5E5;
   border-radius: 2px;
   display: flex;
@@ -24295,45 +24296,88 @@ div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box {
   box-sizing: border-box;
   height: 100%;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section {
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
   justify-content: space-between;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item {
   font-size: 14px !important;
   padding: 13px 16px;
   white-space: nowrap;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section .item:not(:last-of-type) {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item:not(:last-of-type) {
   border-bottom: 1px solid #E5E5E5;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second {
   width: 100%;
 }
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right .box .vertical_section.second .item {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second .item {
   font-weight: 600;
   text-transform: lowercase;
 }
-div#srv_diagnostic div.input_box {
+div#srv_diagnostic .komentarji_wrapper {
+  display: flex;
+  flex-direction: row;
+  gap: 32px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right {
+  width: 50%;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  padding: 16px;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left .title,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right .title {
+  text-transform: uppercase;
+  font-weight: 600;
+  margin-bottom: 16px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left .comment_count,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right .comment_count {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #E5E5E5;
+  margin-bottom: 8px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left .comment_count:last-of-type,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right .comment_count:last-of-type {
+  padding-bottom: 0;
+  border-bottom: none;
+  margin-bottom: 16px;
+}
+div#srv_diagnostic .komentarji_wrapper .komentarji_left a,
+div#srv_diagnostic .komentarji_wrapper .komentarji_right a {
+  text-decoration: none;
+  font-size: 14px !important;
+  white-space: nowrap;
+}
+div#srv_diagnostic .input_box {
   display: flex;
   width: 300px;
   padding: 10px 0 10px 8px;
   border: 1px solid #C4C4C4;
 }
-div#srv_diagnostic div.input_box input {
+div#srv_diagnostic .input_box input {
   border: none;
   margin: 0;
   padding: 0;
   font-size: 16px;
   width: 90%;
 }
-div#srv_diagnostic div.button_holder {
+div#srv_diagnostic .button_holder {
   align-items: center;
   margin-bottom: 0;
 }
-div#srv_diagnostic div.button_holder button {
+div#srv_diagnostic .button_holder button {
   margin: 0 0 0 8px;
 }
 
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index 0b24d24a2..697b46225 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -59,14 +59,14 @@ div#srv_diagnostic {
         }
     }
 
-    div.lastnosti_wrapper {
+    .lastnosti_wrapper {
         display: flex;
         flex-direction: row;
         align-items: space-between;
         gap: 32px;
 
-        div.lastnosti_left,
-        div.lastnosti_middle {
+        .lastnosti_left,
+        .lastnosti_middle {
             width: 33%;
             display: flex;
             flex-direction: column;
@@ -81,6 +81,8 @@ div#srv_diagnostic {
                 flex-direction: column;
                 box-sizing: border-box;
 
+                min-height: 162px;
+
                 .title {
                     text-transform: uppercase;
                     font-weight: $semi-bold;
@@ -113,7 +115,7 @@ div#srv_diagnostic {
                 }
 
                 .time {
-                    font-size: 40px;
+                    font-size: 32px;
                     margin-bottom: 12px;
                     
                     span.time_text {
@@ -129,7 +131,7 @@ div#srv_diagnostic {
             }
         }
 
-        div.lastnosti_right {
+        .lastnosti_right {
             width: 33%;
 
             .box {
@@ -172,7 +174,59 @@ div#srv_diagnostic {
         }
         
     }
-    div.input_box {
+
+    .komentarji_wrapper {
+
+        display: flex;
+        flex-direction: row;
+        gap: 32px;
+
+        .komentarji_left,
+        .komentarji_right {
+            
+            width: 50%;
+
+            border: 1px solid $gray;
+            border-radius: 2px;
+            padding: 16px;
+
+            display: flex;
+            flex-direction: column;
+            box-sizing: border-box;
+
+            .title {
+                text-transform: uppercase;
+                font-weight: $semi-bold;
+                margin-bottom: 16px;
+            }
+
+            .comment_count {
+                width: 100%;
+                display: flex;
+                flex-direction: row;
+                justify-content: space-between;
+
+                padding-bottom: 8px;
+                border-bottom: 1px solid $gray;
+                margin-bottom: 8px;
+
+                &:last-of-type {
+                    padding-bottom: 0;
+                    border-bottom: none;
+                    margin-bottom: 16px;
+                }
+            }
+
+            a {
+                text-decoration: none;
+                font-size: 14px !important;
+                white-space: nowrap;
+            }
+        }
+    }
+
+
+    .input_box {
         display: flex;
 
         width: 300px;
@@ -189,7 +243,7 @@ div#srv_diagnostic {
         }
     }
 
-    div.button_holder {
+    .button_holder {
         align-items: center;
         margin-bottom: 0;
         button {