diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index a97d9c2b5..ef37dbaea 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -7053,7 +7053,7 @@ class SurveyAdminSettings {
 					echo '</div>';
 
 					
-					echo '<div>';
+					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>
@@ -7072,6 +7072,8 @@ class SurveyAdminSettings {
 						}
 						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>';
@@ -7127,26 +7129,24 @@ class SurveyAdminSettings {
 				elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
 				else echo '<span>';*/
 
-				echo '<div class="by">';
-				echo 'Respondent '.$lang['srv_comments_user2'];
-				echo '</div>';
-
 				$datetime = strtotime($row['comment_time']);
 				$datetime = date("d.m.Y G:i", $datetime);
 				
 				if($row['usr_id'] == 0){
-					$user = $lang['guest'];
+					echo '<div class="by">';
+					echo 'Respondent '.$lang['srv_comments_user2'];
+					echo '</div>';
 				}
 				else{
 					$sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'");
 					$rowU = mysqli_fetch_array($sqlU);
 					
 					$user = $rowU['name'];
-				}
 
-				echo '<div class="by">';
-				echo $lang['srv_comments_user'].'<span class="user">'.$user.'</span>'.$lang['srv_comments_user2'];
-				echo '</div>';
+					echo '<div class="by">';
+					echo $lang['srv_comments_user'].'<span class="user">'.$user.'</span>'.$lang['srv_comments_user2'];
+					echo '</div>';
+				}
 
 				echo '<div class="date">';
 				echo $datetime;
@@ -7157,7 +7157,7 @@ class SurveyAdminSettings {
 				echo '</div>';
 				
 				
-				echo '<div>';
+				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>
@@ -7171,14 +7171,13 @@ class SurveyAdminSettings {
 					echo '<label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>';	*/
 					
 					if ($row['ocena']==0) {
-						echo $rowa['id'];
-						echo $row['id'];
-						echo 'test2';
-						echo '<p class="archive_comment" onclick="$.post(\'ajax.php?a=comment_ocena\', {type: \'respondent_survey_comment\', ocena: (\'2\'), id: \''.$rowt['id'].'\', anketa: \''.$rowi['id'].'\'}, function () {window.location.reload();});"> <span class="faicon arhiv link-right"></span>';
+						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>';
@@ -7206,7 +7205,7 @@ class SurveyAdminSettings {
 		echo '<div class="comment_wrapper" id="comment_wrapper_0_5">';
 		echo '<div class="new_comment" id="survey_comment_0_5">';
 		$ba = new BranchingAjax($this->anketa);
-		$ba->add_comment_field(0, '1', '5', false);
+		$ba->add_comment_field(0, '4', '5', false);
 		echo '</div>';
 
 		echo '</div>';
@@ -7819,19 +7818,21 @@ class SurveyAdminSettings {
                                                     </select>';
                                         } else {
 
-											if ($row['ocena']==0) {
+											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" onClick="$(\'#comment_toggle_'.$spr_id.'_4\').toggle();">';
+												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 class="reply_to" onClick="$(\'#comment_toggle_'.$spr_id.'_4\').toggle();">';
-                                        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>';
                                     }
 
@@ -7946,12 +7947,14 @@ class SurveyAdminSettings {
 													</select>';
 										} else {
 
-											if ($row['text2']==0) {
+											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>';
diff --git a/lang/1.php b/lang/1.php
index d1d124a36..5fcc66437 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4530,6 +4530,7 @@ $lang = array (
 	"srv_comments_user"							=>	"Uporabnik ",
 	"srv_comments_user2"						=>	" je komentiral:",
 	"srv_comments_archive"						=>	"Arhiviraj komentar",
+	"srv_comments_unarchive"						=>	"Označi kot nerešeno",
 	"srv_comments_archived"						=>	"Komentar je arhiviran",
 	"srv_comments_new"							=>	"Komentiraj",
 	"srv_zanka_profile_all"						=>	"Brez",
diff --git a/lang/2.php b/lang/2.php
index 4cdd61c62..f091e9fed 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4505,6 +4505,7 @@ $lang = array (
 	"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_new"							=>	"Comment",
 	"srv_zanka_profile_all"						=>	"Without",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8469c0c5e..3cd79a769 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -21887,16 +21887,24 @@ div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset
 div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .content {
   margin: 16px 0;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archive_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archive_comment {
+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 {
+  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 {
   cursor: pointer;
   color: #1E88E5;
   transition: 0.2s;
 }
-div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archived_comment,
-div.page_komentarji_anketa div.komentarji_anketa_holder div.komentarji_anketa fieldset div.comment_box .archived_comment {
-  margin-bottom: 16px;
+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 {
   color: #808080;
 }
 div.page_komentarji div.komentarji_anketa_holder div.komentarji_anketa fieldset div.add_comment_toggle,
@@ -21988,14 +21996,15 @@ div.page_komentarji_anketa ul div.question_comment_holder div.question_comment d
   margin-bottom: 16px;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .archive_comment,
-div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .archive_comment {
+div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .unarchive_comment,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .archive_comment,
+div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .unarchive_comment {
   cursor: pointer;
   color: #1E88E5;
   transition: 0.2s;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .archived_comment,
 div.page_komentarji_anketa ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .archived_comment {
-  margin-bottom: 16px;
   color: #808080;
 }
 div.page_komentarji ul div.question_comment_holder div.question_comment div.comment_box .bottom_options .reply_to a,
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 82cee4673..4a41229b4 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -76,21 +76,28 @@ div.page_komentarji_anketa {
                         margin: 16px 0;
                     }
 
-                    .archive_comment {
+                    .bottom_options {
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: space-between;
+                        align-items: center;
                         margin-bottom: 16px;
 
-                        cursor: pointer;
-                        color: $blue;
+                        .archive_comment,
+                        .unarchive_comment {
 
-                        transition: 0.2s;
-                        &:hover {
-                            $color: darken ($blue, 3%);
+                            cursor: pointer;
+                            color: $blue;
+
+                            transition: 0.2s;
+                            &:hover {
+                                $color: darken ($blue, 3%);
+                            }
                         }
-                    }
 
-                    .archived_comment {
-                        margin-bottom: 16px;
-                        color: $very-dark-gray2
+                        .archived_comment {
+                            color: $very-dark-gray2
+                        }
                     }
                 }
 
@@ -184,7 +191,8 @@ div.page_komentarji_anketa {
                         align-items: center;
                         margin-bottom: 16px;
 
-                        .archive_comment {
+                        .archive_comment,
+                        .unarchive_comment {
                             cursor: pointer;
                             color: $blue;
 
@@ -195,7 +203,6 @@ div.page_komentarji_anketa {
                         }
     
                         .archived_comment {
-                            margin-bottom: 16px;
                             color: $very-dark-gray2
                         }