diff --git a/admin/survey/BranchingAjax.php b/admin/survey/BranchingAjax.php
index 531b6a3ba..c07c93009 100644
--- a/admin/survey/BranchingAjax.php
+++ b/admin/survey/BranchingAjax.php
@@ -1929,89 +1929,22 @@ class BranchingAjax {
 					$sql = sisplet_query("SELECT * FROM post WHERE 1=0");
 				}
 				
-				if (mysqli_num_rows($sql) > 0) {
-					if ($view == 1) {
-						//echo '<b><a href="'.$site_url.'index.php?fl=4&fid='.$row['forum'].'&tid='.$tid.'&sortpostorder='.$sortpostorder.'" target="_blank">'.$lang['srv_forum_go'].'</a></b>';
-						$rows = mysqli_num_rows($sql);
-						if ($rows > 0) echo '<img src="'.$site_url.'/admin/survey/img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
-						echo '<br /><br />';
-					} elseif ($view == 3) {
-						echo '<div style="width:45%; float:left">';
-						echo '<h3 class="red"><b>'.$lang['comments'].'</b>';
-						$rows = mysqli_num_rows($sql);
-						if ($rows > 0) echo '<img src="img_0/'.($sortpostorder==1?'up':'down').'.gif" style="float:right" title="'.($sortpostorder==1?$lang['forum_desc']:$lang['forum_asc']).'" />';
-						echo '</h3>';
-					}
-				}
-				
-				// textarea za oddat komentar - zgoraj
+				/*/ textarea za oddat komentar - zgoraj
 				if ($addfieldposition == 1) {
 					$this->add_comment_field($spremenljivka, $type, $view);
 					echo '<br /><br />';
-				}
+				}*/
 				
-				if (mysqli_num_rows($sql) > 0) {
-					
-					$i = 0;
-					$rows = mysqli_num_rows($sql);
-					while ($row = mysqli_fetch_array($sql)) {
-
-						// Prikazemo zgodovino glede na nastavitev
-						if($comment_history == '2' || (($comment_history == '0' || $comment_history == '') && $row['uid'] == $global_user_id)){
-							if ($row['ocena'] == 0) echo '<span style="color:black">';
-								elseif ($row['ocena'] == 1) echo '<span style="color:darkgreen">';
-								elseif ($row['ocena'] == 2) echo '<span style="color:#999999">';
-								elseif ($row['ocena'] == 3) echo '<span style="color:#999999">';
-								else echo '<span>';
-							
-							echo '<b>'.$f->user($row['uid']).'</b> ('.$f->datetime1($row['time']).'):';
-							
-							if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) {
-									
-								echo '<div style="float:right">';
-								
-								if ($commentmarks == 1) {
-									echo '	<select name="ocena" onchange="$.post(siteurl+\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: this.value, id: \''.$row['id'].'\', anketa: \''.$rowi['id'].'\'}, function () { add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', \'\' ); });">
-												<option value="0"'.($row['ocena']==0?' selected':'').'>'.$lang['srv_undecided'].'</option>
-												<option value="1"'.($row['ocena']==1?' selected':'').'>'.$lang['srv_todo'].'</option>
-												<option value="2"'.($row['ocena']==2?' selected':'').'>'.$lang['srv_done'].'</option>
-												<option value="3"'.($row['ocena']==3?' selected':'').'>'.$lang['srv_not_relevant'].'</option>
-											</select>';
-								} else {
-									echo '<input type="checkbox" name="ocena_'.$row['id'].'" id="ocena_'.$row['id'].'" style="margin-right:3px;" onchange="$.post(siteurl+\'ajax.php?a=comment_ocena\', {type: \'question_comment\', ocena: (this.checked?\'2\':\'0\'), id: \''.$row['id'].'\', anketa: \''.$rowi['id'].'\'}, function () { add_comment(\''.$spremenljivka.'\', \''.$type.'\', \''.$view.'\', \'\' ); });" value="2" '.($row['ocena'] >= 2?' checked':'').' /><label for="ocena_'.$row['id'].'">'.$lang['srv_done'].'</label>';
-								}
-								//echo '	<br /><a href="javascript:comment_on_comment(\''.$rowt['id'].'\');">'.$lang['srv_comment_comment'].'</a>';
-								echo '</div>';
-							}
-							
-							echo '<br/>'.$row['vsebina'].'<hr>';
-							
-							echo '</span>';
-						}
-						
-						//}
-						$i++;
-						
-						// Nastavimo oglede foruma in teme
-						if ($global_user_id > 0) {
-							$sqla2 = sisplet_query("SELECT time FROM views WHERE pid='" .$row['id'] ."' AND uid='$global_user_id'");
-							if (mysqli_num_rows($sqla2) > 0) {
-								$sqla3 = sisplet_query("UPDATE views SET time=NOW() WHERE pid='" .$row['id'] ."' AND uid='$global_user_id'");
-							} else {
-								$sqla3 = sisplet_query("INSERT INTO views (pid, uid, time) VALUES ('" .$row['id'] ."', '$global_user_id', NOW())");
-							}
-						}
-					}
-				}
 				
 				// textarea za oddat komentar - spodaj
 				if ($addfieldposition == 0 || $addfieldposition == '') {
-					echo '<br />';
-					$this->add_comment_field($spremenljivka, $type, $view);
+                    echo '<div id="survey_comment_0_1">';
+					$this->add_comment_field($spremenljivka, $type, $view, $buttons=false);
+					echo '</div>';
 				}
 			
 			} else {
-				$this->add_comment_field($spremenljivka, $type, $view);
+				//$this->add_comment_field($spremenljivka, $type, $view);
 			}
 					
 			if ($_REQUEST['refresh'] != '1' || $view==3)
diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 67a217d87..c9ee72973 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -1431,7 +1431,7 @@ class SurveyAdmin
                     echo $lang['comments'];
                     echo '</div>';
 
-				    $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;';
+				    $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;';
                     echo '<div class="links" onclick="'.$comment_link.'">';
                     echo $lang['srv_testiranje_komentarji_anketa_title'];
                     echo ' (' . $comment_count['question']['unresolved'];
@@ -1439,7 +1439,7 @@ class SurveyAdmin
                     echo '<span class="faicon fa-angle-right"></span>';
                     echo '</div>';
 
-				    $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji_anketa\'; return false;';
+				    $comment_link = 'window.location.href=\'' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji\'; return false;';
                     echo '<div class="links" onclick="'.$comment_link.'">';
                     echo $lang['srv_testiranje_komentarji_title'];
                     echo ' (' . ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']); //nerešeni