diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 0108e9e76..16095d52f 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -2098,7 +2098,7 @@ class Branching {
 		}
 
 		// zadnji spremenljivki v ifu, tudi dodamo PB izven pagebreaka (da se doda, tam kjer se potem prikaže)
-		if ($rows['pagebreak'] == 0 AND (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
+		if ($rows['pagebreak'] == 0 && (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) {
 			echo '<li id="droppable_'.$row1['parent'].'-'.$row1['vrstni_red'].'" class="drop" spr="0" if="'.$if.'" endif="1" spr_pb="'.$spr.'">';
 			echo '  <div class="pb_new" title="'.$lang['srv_add_pagebreak'].'">';
             echo '      <div class="pb_page_hover"><span class="faicon paragraph"></span>'.$lang['srv_add_pagebreak'].'</div>';
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 5ee721642..c75f561cb 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -4303,10 +4303,10 @@ class SurveyAdminAjax {
 			}
 			echo '  <div  id="spremenljivka_preview">';
 			if ( $_POST['spremenljivka'] == -1 ) {
-				\App\Controllers\BodyController::getInstance()->displayIntroduction();
+				\App\Controllers\BodyController::getInstance()->displayIntroductionContent();
 			}
 			elseif ( $_POST['spremenljivka'] == -2 ) {
-				\App\Controllers\BodyController::getInstance()->displayKonec();
+				\App\Controllers\BodyController::getInstance()->displayKonecContent();
 			}
 			elseif ( $_POST['spremenljivka'] == -3 ) {
 				\App\Controllers\StatisticController::displayStatistika();
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index aff2d3ef7..f50f9f3a7 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -5920,8 +5920,8 @@ class SurveyAdminSettings {
 			return $total;
 		}
 		
-		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
-		$skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s';
+		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
+		$skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'<span class="time_text">s</span>';
 		
 		if ($samo_izracunaj_skupini_cas == 1)
 			return $skupni_cas;
@@ -5949,7 +5949,7 @@ class SurveyAdminSettings {
 			echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
 
 			echo '<td class="right time">';
-			echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
+			echo ($time[0]<60?round($time[0],1).'<span class="time_text">s</span> ':round($time[0]/60,1).'<span class="time_text">min</span> ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'<span class="time_text">s</span> ':round($time[1]/60,1).'<span class="time_text">min</span> ').'</span>';
 			echo '</td>';
 
 			echo '<td class="graph_cell">';
@@ -6030,7 +6030,7 @@ class SurveyAdminSettings {
 			echo '</tr>';
 			
 		}
-		echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td></tr>';
+		echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($neto_total, 60), 0).'<span class="time_text">s</span> / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td></tr>';
 		echo '</table>';
 
 		echo '<div class="tabela_trajanje_legenda">';
@@ -6063,7 +6063,7 @@ class SurveyAdminSettings {
 					echo '<td class="nowrap">'.$block_labels_by_number[$vrstni_red+1].'</td>';
 
 					echo '<td class="right time">';
-					echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
+					echo ($time[0]<60?round($time[0],1).'<span class="time_text">s</span> ':round($time[0]/60,1).'<span class="time_text">min</span> ').'<span class="gray">/ '.($time[1]<60?round($time[1],1).'<span class="time_text">s</span> ':round($time[1]/60,1).'<span class="time_text">min</span> ').'</span>';
 					echo '</td>';
 
 					echo '<td class="graph_cell">';
@@ -6076,7 +6076,7 @@ class SurveyAdminSettings {
 
 					echo '</tr>';
 			}
-			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</td><td></td><td></td><td></td></tr>';
+			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($totalb, 60), 0).'<span class="time_text">s</span></td><td></td><td></td><td></td></tr>';
 
 			echo '</table>';
 
@@ -6148,7 +6148,7 @@ class SurveyAdminSettings {
 				}
 				
 			}
-			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td></tr>';
+			echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td><td class="right time">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($neto_total, 60), 0).'<span class="time_text">s</span> / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($bruto_total, 60), 0).'<span class="time_text">s</span></td><td></td></tr>';
 			echo '</table>';
 
 			echo '<div class="tabela_trajanje_legenda">';
@@ -6641,12 +6641,12 @@ class SurveyAdminSettings {
 		if ($max == 0) return;
 		
 		if ($samo_izracunaj_skupini_cas == 1)
-			return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
+			return (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
 		
 		
 		// izpis
-		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
-		$predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0);
+		$skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>';
+		$predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total_predvideni, 60), 0);
 
 		echo '<fieldset><legend>'.$lang['srv_total_trajanje'].'</legend>';
 		echo '<p class="semi-bold">'.$lang['srv_dejansko_trajanje_real'].':</p>';
@@ -6661,6 +6661,7 @@ class SurveyAdminSettings {
 		echo '<tr>';
 		echo '<th>'.$lang['srv_casi_po_straneh_stran'].'</th>';
 		echo '<th colspan="2">'.$lang['srv_neto_v_cas'];
+		
 		if	($_GET['predvideni'] == 1) {
 			echo ' / '.$lang['srv_testiranje_predvidenicas_1'];
 		}
@@ -6677,14 +6678,14 @@ class SurveyAdminSettings {
 			
 			echo '<tr>';
 			echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
-			echo '<td class="right time">'.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ');
+			echo '<td class="right time">'.($time<60 ? round($time,1).'<span class="time_text">s</span> ' : round($time/60,1).'<span class="time_text">min</span> ');
 			if	($_GET['predvideni'] == 1) {
 				if ($rezanje_preskocene == 1)
 					$time = $expected_time[$vrstni_red][0];
 				else
 					$time = $expected_time[$vrstni_red][1];
 
-				echo '<span class="gray"> / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').'</span>';
+				echo '<span class="gray"> / '.($time<60 ? round($time,1).'<span class="time_text">s</span> ' : round($time/60,1).'<span class="time_text">min</span> ').'</span>';
 			}
 			echo '</td>';
 			
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 0211672c3..d5a9e612a 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -1540,20 +1540,20 @@ class GDPR{
 			$naslov = '<h3 style="margin-top: 0;">'.$lang['srv_gdpr_intro_title'].'</h3>';
 			
 			$naslov .= '<p>'.$lang['srv_gdpr_intro'].':</p>';
-			$naslov .= '<ul>';
+			$naslov .= ' <ul>';
 			if($user_settings['name'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_name'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_name'].'</li> ';
 			if($user_settings['email'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_email'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_email'].'</li> ';
 			if($user_settings['location'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_location'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_location'].'</li> ';
 			if($user_settings['phone'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_phone'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_phone'].'</li> ';
 			if($user_settings['web'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_web'].'</li>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_web'].'</li> ';
 			if($user_settings['other'])
-				$naslov .= '<li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li>';
-			$naslov .= '</ul>';
+				$naslov .= ' <li>'.$lang['srv_gdpr_intro_other'].' - '.$user_settings['other_text'.$translation].'</li> ';
+			$naslov .= '</ul> ';
 
 			$naslov .= '<p>'.$lang['srv_gdpr_intro2'];
 			$naslov .= ' '.$lang['srv_gdpr_intro3'].'</p>';
diff --git a/admin/survey/classes/class.SurveyCheck.php b/admin/survey/classes/class.SurveyCheck.php
index ba8715fb9..2e81972ae 100644
--- a/admin/survey/classes/class.SurveyCheck.php
+++ b/admin/survey/classes/class.SurveyCheck.php
@@ -84,9 +84,10 @@ class SurveyCheck {
 
         // Dobimo stevilo odgovorov na anketo
         $stevilo_odgovorov = SurveyInfo::getInstance()->getSurveyAnswersCount();
+        $stevilo_odgovorov_limit = AppSettings::getInstance()->getSetting('app_limits-response_count_limit');
 
         // Obvestilo (mail adminu) posljemo pri dosezeni stevilki
-        if($stevilo_odgovorov == AppSettings::getInstance()->getSetting('app_limits-response_count_limit')){
+        if($stevilo_odgovorov > 0 && $stevilo_odgovorov % $stevilo_odgovorov_limit === 0){
             $this->sendAlert($alert_type='limit_responses', $stevilo_odgovorov);
 
             // Deaktiviramo anketo, ce je aktivna ?
diff --git a/admin/survey/classes/class.SurveyDiagnostics.php b/admin/survey/classes/class.SurveyDiagnostics.php
index 4f058e48f..557f37066 100644
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@@ -472,6 +472,27 @@ class SurveyDiagnostics
 		echo '<div class="lastnosti_wrapper">';
 
 		echo '<div class="lastnosti_left">';
+
+		echo '<div class="box">';
+		echo '<div class="title">'.$lang['srv_neto_v_cas'].'</div>';
+
+		// Dejansko trajanje
+		$sas = new SurveyAdminSettings();
+		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
+		echo '<p class="time">'.$dejanski_cas.'</p>';
+		if ($sas->testiranje_cas(1) == null)
+			echo $lang['srv_data_no_data'];
+		else
+			echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'">'.$lang['srv_testiranje_cas_info'].'</a>';
+		echo '</div>'; #box
+
+		//Ocena trajanja
+		echo '<div class="box">';
+		echo '<div class="title">'.$lang['srv_testiranje_predvidenicas'].'</div>';
+		echo '<p class="time">'.$skupni_cas.'</p>';
+		echo '<a href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas">'.$lang['srv_testiranje_predvidenicas_info'].'</a>';
+		echo '</div>'; #box
+
 		echo '</div>'; #lastnosti_left
 
 		echo '<div class="lastnosti_middle">';
@@ -492,7 +513,7 @@ class SurveyDiagnostics
 		echo '<script type="text/javascript"> diagnosticsChart(\'survey_length\','.$display_length.'); </script>';
 		
 		echo '<div class="other_text">';
-		echo '<p>'.$time.'</p>';
+		echo '<p class="desc">'.$time.'</p>';
 		echo '<a '.$link_time.'>'.$lang['srv_diagnostic_time_extra'].'</a>';
 		echo '</div>';
 		
@@ -515,7 +536,7 @@ class SurveyDiagnostics
 		echo '<script type="text/javascript"> diagnosticsChart(\'survey_complex\','.$display_complex.'); </script>';
 		
 		echo '<div class="other_text">';
-		echo '<p>'.$kompleksnost.'</p>';
+		echo '<p class="desc">'.$kompleksnost.'</p>';
 		echo '<a '.$link_complex.'>'.$lang['srv_diagnostic_complexity_extra'].'</a>';
 		echo '</div>';
 		
@@ -524,109 +545,35 @@ class SurveyDiagnostics
 		
 		echo '</div>'; #lastnosti_middle
 
+		//Ostale lastnosti ankete
 		echo '<div class="lastnosti_right">';
+		
+		echo '<div class="box">';
+		echo '<div class="vertical_section">';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_9'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_5'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_5a'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_8'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_2'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_3'].':</div>';
+		echo '<div class="item">'.$lang['srv_diagnostic_4_element_4'].':</div>';
+		echo '</div>';
+		echo '<div class="vertical_section second">';
+		echo '<div class="item">'.(int)SurveyInfo::getSurveyGroupCount() . ' ' . ((int)SurveyInfo::getSurveyGroupCount() == 1 ? $lang['page']: $lang['srv_diagnostics_strani']).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_spremenljivka . ' ' . ((int)$this->cnt_spremenljivka == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_spremenljivka == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_spremenljivka > 4 || (int)$this->cnt_spremenljivka == 0 ? $lang['srv_info_questions1'] : $lang['srv_info_questions3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_hidden . ' '. ((int)$this->cnt_hidden == 1 ? $lang['srv_hidden_text'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_hidden_text2'] : ((int)$this->cnt_hidden > 4 || (int)$this->cnt_hidden == 0 ? $lang['srv_hidden_text4'] : $lang['srv_hidden_text3']) )). ' ' . ((int)$this->cnt_hidden == 1 ? $lang['srv_casi_po_vprasanjih_vprasanje'] : ((int)$this->cnt_hidden == 2 ? $lang['srv_info_questions2'] : ((int)$this->cnt_hidden > 4 || (int)$this->cnt_hidden == 0 ? $lang['srv_info_questions1'] : $lang['srv_info_questions3']) )).'</div>';
+		echo '<div class="item">'.(int)SurveyInfo::getSurveyVariableCount() . ' ' . ((int)SurveyInfo::getSurveyVariableCount() == 1 ? $lang['srv_spremenljivka'] : ((int)SurveyInfo::getSurveyVariableCount() == 2 ? $lang['srv_spremenljivka2'] : ((int)SurveyInfo::getSurveyVariableCount() > 4 || (int)SurveyInfo::getSurveyVariableCount() == 0 ? $lang['srv_spremenljivka4'] : $lang['srv_spremenljivka3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_conditions . ' ' . ((int)$this->cnt_conditions == 1 ? $lang['srv_pogoj'] : ((int)$this->cnt_conditions == 2 ? $lang['srv_pogoj2'] : ((int)$this->cnt_conditions > 4 || (int)$this->cnt_conditions == 0 ? $lang['srv_pogoj4'] : $lang['srv_pogoj3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->cnt_blocks . ' ' . ((int)$this->cnt_blocks == 1 ? $lang['srv_blok'] : ((int)$this->cnt_blocks == 2 ? $lang['srv_blok2'] : ((int)$this->cnt_blocks > 4 || (int)$this->cnt_blocks == 0 ? $lang['srv_blok4'] : $lang['srv_blok3']) )).'</div>';
+		echo '<div class="item">'.(int)$this->globina.'</div>';
+		echo '</div>';
+		echo '</div>'; #box
+
 		echo '</div>'; #lastnosti_right
 
 		echo '</div>'; #lastnosti_wrapper
 
 
-
-
-		/////////////////////////////////////////////////////////////////////// Lastnosti staro
-
-		echo '<div class="lastnosti_wrapper">';
-		
-		echo '<div class="lastnosti_left">';
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_diagnostika_table_title4'].'</th>';
-		echo '<th>'.$lang['srv_diagnostika_table_title'].'</th>';
-		echo '</tr>';
-		
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_5'].'</td>';
-        echo '<td>';
-		echo $time.'&nbsp&nbsp';
-        if($lang['id'] == '1')
-			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kako-dolga-naj-bo-moja-anketa?from1ka=1" target="_blank"';
-        else
-			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/how-long-should-my-survey-be?from1ka=1" target="_blank"';
-		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_9'].'</td>';
-		echo '<td>'.(int)SurveyInfo::getSurveyGroupCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5'].'</td>';
-		echo '<td>'.(int)$this->cnt_spremenljivka.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_5a'].'</td>';
-		echo '<td>'.(int)$this->cnt_hidden.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_8'].'</td>';
-		echo '<td>'.(int)SurveyInfo::getSurveyVariableCount().'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_2'].'</td>';
-		echo '<td>'.(int)$this->cnt_conditions.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_3'].'</td>';
-		echo '<td>'.(int)$this->cnt_blocks.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_4_element_4'].'</td>';
-		echo '<td>'.(int)$this->globina.'</td>';
-		echo '</tr>';
-		echo '<tr>';
-		echo '<td>'.$lang['srv_diagnostic_1_element_4'].'</td>';
-		echo '<td>';
-		echo $kompleksnost.'&nbsp&nbsp';
-        
-		if($lang['id'] == '1')
-			$link_status = 'href="https://www.1ka.si/d/sl/spletne-ankete/osnovna-priporocila/kaj-pomeni-kompleksnost-ankete?from1ka=1" target="_blank"';
-        else
-			$link_status = 'href="https://www.1ka.si/d/en/web-surveys/basic-recommendations/what-does-survey-complexity-mean?from1ka=1" target="_blank"';
-        
-		echo '<a class="noline faicon open_icon" '.$link_status.'></a>';
-		echo '</a>';
-		echo '</tr>';
-		
-		echo '</table>';
-		echo '</div>';
-
-		
-		echo '<div class="lastnosti_right">';
-		# Trajanje - linki
-		echo '<table class="srv_diagnostic_results">';
-		echo '<tr>';
-		echo '<th>'.$lang['srv_info_duration'].'</th>';
-		echo '<th></th>';
-		echo '<th class="center">'.$lang['srv_diagnostika_table_title2'].'</th>';
-		echo '</tr>';
-
-		echo '<tr>';
-		echo '<td>'.$lang['srv_testiranje_predvidenicas'].'</td>';
-		echo '<td>'.$skupni_cas.'</td>';
-		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m=predvidenicas" title="'.$lang['srv_testiranje_predvidenicas'].'"></a></td>';
-		echo '</tr>';
-		
-		$sas = new SurveyAdminSettings();
-		$dejanski_cas = ($sas->testiranje_cas(1) == null) ? '-' : $sas->testiranje_cas(1);
-		echo '<tr>';
-		echo '<td>'.$lang['srv_testiranje_cas'].'</td>';
-		echo '<td>'.$dejanski_cas.'</td>';
-		echo '<td class="center"><a class="noline faicon open_icon" href="index.php?anketa=' . $this->sid . '&amp;a='.A_TESTIRANJE.'&amp;m='.M_TESTIRANJE_CAS.'" title="'.$lang['srv_testiranje_cas'].'"></a></td>';
-		echo '</tr>';
-		
-		echo '</table>';
-		echo '</div>';
-
-		echo '</div>';
-
 		// KOMENATRJI
 		# nerazrešeni komentarji uporabnikov $commentsUser,$commentsUserFinished		
 		$commentsUserUnresolved = $commentsUser - $commentsUserFinished;
@@ -638,36 +585,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"
 	}
 	
@@ -807,7 +770,7 @@ class SurveyDiagnostics
 		$sas = new SurveyAdminSettings();
 		$total = $sas->testiranje_predvidenicas(2);
 		$this->time = array( $total,
-							 (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'
+							 (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'<span class="time_text">min</span> ':'').''.round(bcmod($total, 60), 0).'<span class="time_text">s</span>'
 							);
 		
 		if ($total >= TIME_SOFT_LIMIT) {
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index f2139e11e..e947912b8 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -7820,18 +7820,6 @@ class SurveyAnalysis {
 		# ponastavimo nastavitve- filter
 		self::Display();
 		echo '</div>';
-			
-		echo '<div id="navigationBottom" class="printHide">';
-	
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/printer.png" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
-		echo '<span  class="spaceRight floatRight printHide" style="margin-top:6px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls"></span></a>';
-		echo '</span>';
-	
-		echo '<br class="clr" />';
-		echo '</div>';
 	
 		echo '</body>';
 		echo '</html>';
diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
index 95ac7c36f..14637c15b 100644
--- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
+++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
@@ -3171,7 +3171,7 @@ class SurveyDataDisplay{
 		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
 		echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
 		echo '<style>';
-		echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
+		echo '.container {margin-bottom:45px;} #dataTableScroller {display:none;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
 		echo '</style>';
 		echo '<!--[if lt IE 7]>';
 		echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
@@ -3227,9 +3227,6 @@ class SurveyDataDisplay{
 								'a'=>'list_xls',
 								'anketa'=>$anketa)));
 		echo '<div class="printHide" style="margin-top:6px; margin-bottom:60px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
 		
 		if (isset($properties['profile_id_status']))
 		{
@@ -3271,19 +3268,7 @@ class SurveyDataDisplay{
 		</script><?php
 		
 		echo '</div>';
-			
-		echo '<div id="navigationBottom" class="printHide">';
-
-		echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="'.$site_url.'admin/survey/icons/icons/printer.png" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
-		echo '<span  class="spaceRight floatRight printHide" style="margin-top:6px;">';
-		echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url2.'" target="_blank"><span class="faicon rtf icon-as_link"></span></a>&nbsp;&nbsp;';
-		echo '<a href="'.$_url3.'" target="_blank"><span class="faicon xls icon-as_link"></span></a>';
-		echo '</span>';
-		
-		echo '<br class="clr" />';
-		echo '</div>';
-		
+					
 		echo '</body>';
 		echo '</html>';
 	}
diff --git a/admin/survey/minify/groupsConfig.php b/admin/survey/minify/groupsConfig.php
index d66d59c19..cb3c70ab3 100644
--- a/admin/survey/minify/groupsConfig.php
+++ b/admin/survey/minify/groupsConfig.php
@@ -97,7 +97,8 @@ return [
         dirname(__FILE__).'/../script/custom_column_label_respondent.js',
         dirname(__FILE__).'/../script/ImageHotSpot/imagemap_question_editor.js',
         dirname(__FILE__).'/../script/ImageHotSpot/imageHotspot.js',
-        dirname(__FILE__).'/../script/Chartjs/Chart.js', //source za chartjs grafe
+
+        dirname(__FILE__).'/../script/Chartjs/chart.js', //source za chartjs grafe
         dirname(__FILE__).'/../script/Chartjs.js',
 
         dirname(__FILE__).'/../script/jquery/jquery.imagemapster.js',
diff --git a/admin/survey/script/Chartjs.js b/admin/survey/script/Chartjs.js
index 20b1f89ec..dbda4e8ad 100644
--- a/admin/survey/script/Chartjs.js
+++ b/admin/survey/script/Chartjs.js
@@ -16,7 +16,7 @@ function diagnosticsChart(place,display) {
 		data: data,
 		options: {
 			events: [], //no hover labels,animations,...
-			cutout: 32, //slice width
+			cutout: 30, //slice width
 		}
 	};
 
diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index af727b551..4f22c42e2 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -665,8 +665,6 @@ class DisplayController{
 
         echo '<form name="register" id="register_form" class="register_form register_window" action="'.$site_url.'frontend/api/api.php?action=register" method="post">';
         
-        // echo '  <span class="subtitle">'.$lang['cms_register_user_text'].'</span>';
-
 		// Email
 		echo '  <label for="email" '.(isset($error['email']) ? 'class="red"' : '').'>'.$lang['email'].':</label>'; 
 		echo '  <input class="regfield '.(isset($error['email']) ? 'red' : '').'" id="email" name="email" value="'.$email.'" placeholder="" type="text">';
@@ -674,11 +672,7 @@ class DisplayController{
 		// Ime
 		echo '  <label for="ime" '.(isset($error['ime']) ? 'class="red"' : '').'>'.$lang['cms_register_user_nickname'].':</label>';
         echo '  <input class="regfield '.(isset($error['ime']) ? 'red' : '').'" id="ime" name="ime" value="'.$ime.'" placeholder="" type="text">';
-				
-		// // RECAPTCHA
-		// if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
-		// 	echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
-		
+						
 		// Geslo
         echo '  <label for="p1" '.(isset($error['password']) ? 'class="red"' : '').'>'.$lang['login_password'].':</label>';
         echo '  <input id="p1" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo" placeholder="" type="password">';
@@ -688,20 +682,16 @@ class DisplayController{
         echo '  <input id="p2" class="text '.(isset($error['password']) ? 'red' : '').'" value="" name="geslo2" placeholder="" type="password">';
 
 		// Strinjam se s pogoji
-        //echo '				<input id="IAgree" type="hidden" name="agree" value="1">';
         $terms_url = ($lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' : 'https://www.1ka.si/d/en/about/terms-of-use';
 		echo '  <div class="form_row agreement '.(isset($_GET['missing_agree']) ? ' red' : '').'">';
-		echo '      <input id="IAgree" type="checkbox" name="agree" value="1"><label for="IAgree">';
-		echo        '<div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</label>';
-		// echo '      <br /><span class="red italic">*'.$lang['cms_register_mandatory_field'].'</span>';
-        echo '</div>';
+		echo '      <input id="IAgree" type="checkbox" name="agree" value="1">';
+		echo '      <label for="IAgree"><div class="checkbox_text_holder"> '.str_replace('TERMS_URL', $terms_url, $lang['cms_register_user_terms_of_use2']).'</div></label>';
+        echo '  </div>';
 
         // RECAPTCHA
 		if(AppSettings::getInstance()->getSetting('google-secret_captcha') !== false && AppSettings::getInstance()->getSetting('google-recaptcha_sitekey') !== false)
         echo '  <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'" '.(isset($_GET['invalid_recaptcha']) ? ' style="border:1px red solid"' : '').'></div>';	
 
-
-        echo '  </div>';
         
         // Error text
         if(!empty($error)){
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index f89329de0..d31eafa58 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -3,7 +3,8 @@
     Created on : 28.3.2020
     Author     : Peter Hrvatin
 */
-/* BARVE */ /* FONTI */
+/* BARVE */
+/* FONTI */
 @import url("https://fonts.googleapis.com/css?family=Montserrat:300,400,400i,600,700&amp;subset=latin-ext");
 @import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 .thin {
@@ -458,7 +459,7 @@ body.login_noEmail #main .landing_page_window .agreement {
   cursor: pointer;
   display: flex;
   align-items: baseline;
-  margin: 17px 0 5px 0;
+  margin: 16px 0 0 0;
 }
 body.landing_page #main .landing_page_window .agreement input,
 body.register #main .landing_page_window .agreement input,
@@ -494,8 +495,7 @@ body.landing_page #main .landing_page_window .g-recaptcha,
 body.register #main .landing_page_window .g-recaptcha,
 body.login #main .landing_page_window .g-recaptcha,
 body.login_noEmail #main .landing_page_window .g-recaptcha {
-  width: 304px;
-  margin-top: 20px;
+  margin-top: 16px;
 }
 
 /*body.register{
@@ -730,13 +730,16 @@ body.reset_password_activate div.label {
   #main .main_content {
     min-height: unset;
   }
+
   /* --------------HAMBURGER---------------------------------- */
   .nav-desktop {
     display: none;
   }
+
   .mobile {
     display: block;
   }
+
   #nav-icon3 {
     width: 38px;
     height: 20px;
@@ -780,35 +783,42 @@ body.reset_password_activate div.label {
   #nav-icon3 span:nth-child(4) {
     top: 18px;
   }
+
   #nav-icon3.open span:nth-child(1) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
+
   #nav-icon3.open span:nth-child(2) {
     -webkit-transform: rotate(45deg);
     -moz-transform: rotate(45deg);
     -o-transform: rotate(45deg);
     transform: rotate(45deg);
   }
+
   #nav-icon3.open span:nth-child(3) {
     -webkit-transform: rotate(-45deg);
     -moz-transform: rotate(-45deg);
     -o-transform: rotate(-45deg);
     transform: rotate(-45deg);
   }
+
   #nav-icon3.open span:nth-child(4) {
     top: 9px;
     width: 0%;
     left: 50%;
   }
+
   #links {
     display: none;
   }
+
   /*  */
   .aai a {
     color: #333333;
   }
+
   #links.open {
     position: absolute;
     top: 72px;
@@ -818,8 +828,9 @@ body.reset_password_activate div.label {
     align-items: center;
     width: 100%;
     height: 100vh;
-    background-color: rgb(255, 255, 255);
+    background-color: white;
   }
+
   #links .menu_item {
     font-size: 30px;
     margin-top: 30px;
@@ -831,6 +842,7 @@ body.reset_password_activate div.label {
   #links .menu_item a:hover {
     color: #1E88E5;
   }
+
   body #main .main_content {
     padding: 10px 20px 40px 20px;
   }
@@ -872,6 +884,7 @@ body #main .main_content input[type=button] {
     margin: 0;
     width: 100%;
   }
+
   body.landing_page,
 body.login,
 body.register,
@@ -958,6 +971,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     width: 100%;
     box-sizing: border-box;
   }
+
   footer {
     padding: 0 20px;
   }
@@ -988,6 +1002,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
   footer .footer_content .logo_holder img {
     margin: 20px auto 30px auto;
   }
+
   .cookie_notice {
     flex-direction: column;
   }
@@ -995,6 +1010,7 @@ body.login_noEmail #content.aai #main .main_content .app_subtitle {
     margin: 0 0 20px 0;
     text-align: center;
   }
+
   body #main .main_content .register_holder h1 {
     font-size: 50px;
     font-weight: 300;
@@ -1249,16 +1265,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type {
   margin-right: 20px;
 }
 
-iframe {
-  max-width: 304px;
-  width: unset;
-}
-
-.rc-anchor-normal .rc-anchor-checkbox-label {
-  max-width: 152px;
-  width: unset;
-}
-
 body.login_noEmail #main {
   background-image: none;
   background-color: #F8F8F8;
diff --git a/lang/1.php b/lang/1.php
index e20f2ab9d..670fa9ae6 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2183,6 +2183,9 @@ $lang = array (
 	"srv_visible_on"		=>	"Vidno",
 	"srv_visible_off"		=>	"Skrito",
 	"srv_hidden_text"		=>	 "Skrito",
+	"srv_hidden_text2"		=>	 "Skriti",
+	"srv_hidden_text3"		=>	 "Skrita",
+	"srv_hidden_text4"		=>	 "Skritih",
 	"srv_system_text"		=>	 "Sistemsko",
 	"srv_visible_dostop"	=>	"Vprašanje je vidno",
 	"srv_previewalert"		=>	"Trenutno ste v predogledu ankete!<br>Odgovori se <b class=\"red\">ne bodo shranili</b> v bazo!",
@@ -3538,8 +3541,10 @@ $lang = array (
 	"srv_bottom_archive"			=>	"Arhiviranje",
 	"srv_info_name"					=>	"Ime ankete",
 	"srv_info_note"					=>	"Opomba",
-	"srv_info_questions"			=>	"Vpra&#353;anj",
+	"srv_info_questions"			=>	"Vprašanj",
 	"srv_info_questions1"			=>	"Vprašanj",
+	"srv_info_questions2"			=>	"Vprašanji",
+	"srv_info_questions3"			=>	"Vprašanja",
 	"srv_info_variables"			=>	"Spremenljivk",
 	"srv_info_pages"				=>	"Strani", 
 	"srv_info_answers"				=>	"Odgovorov",
@@ -3588,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",
@@ -4019,8 +4026,10 @@ $lang = array (
 	"srv_lang_rem_confirm"				=>	"Ali ste prepri&#269;ani, da &#382;elite odstraniti ta prevod?",
 	"srv_testiranje"					=>	"Testiranje",			
 	"srv_testiranje_oblivanje"			=>	"Testni podatki",			
-	"srv_testiranje_cas"				=>	"Dejanski &#269;asi",			
+	"srv_testiranje_cas"				=>	"Dejanski časi",			
+	"srv_testiranje_cas_info"				=>	"Več informacij o dejanskem trajanju",			
 	"srv_testiranje_predvidenicas"		=>	"Ocenjevanje trajanja",			
+	"srv_testiranje_predvidenicas_info"		=>	"Več informacij o ocenjevanju trajanja",			
 	"srv_testiranje_predvidenicas_1"	=>	"Predvideno trajanje",			
 	"srv_collectData"					=>	"Priprava podatkov",			
 	"srv_testiranje_komentarji"			=>	"Komentarji",			
@@ -4291,7 +4300,13 @@ $lang = array (
 	"srv_basic"							=>	"Osnovno",
 	"srv_advanced"						=>	"Napredne mo&#382;nosti",
 	"srv_pogoj"							=>	"Pogoj",
+	"srv_pogoj2"							=>	"Pogoja",
+	"srv_pogoj3"							=>	"Pogoji",
+	"srv_pogoj4"							=>	"Pogojev",
 	"srv_blok"							=>	"Blok",
+	"srv_blok2"							=>	"Bloka",
+	"srv_blok3"							=>	"Bloki",
+	"srv_blok4"							=>	"Blokov",
 	"srv_calc"							=>	"Kalkulacija",
 	"srv_quota"							=>	"Kvota",
 	"srv_zanka"							=>	"Zanka",
@@ -4403,6 +4418,9 @@ $lang = array (
 	"srv_export_replace1"				=>	"Znak:",
 	"srv_export_replace2"				=>	" v tekstu zamenjaj z:",
 	"srv_spremenljivka"					=>	"Spremenljivka",
+	"srv_spremenljivka2"					=>	"Spremenljivki",
+	"srv_spremenljivka3"					=>	"Spremenljivke",
+	"srv_spremenljivka4"					=>	"Spremenljivk",
 	"srv_vrednost"						=>	"Vrednost",
 	"srv_vrednost_default"				=>	"Prednastavljena vrednost",
 	"srv_your_base_lang"				=>	"Va&#353; osnovni jezik je",
@@ -5130,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",
@@ -5356,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",			
@@ -5419,13 +5440,13 @@ $lang = array (
 	"srv_diagnostic_4_element_0" 				=> 'Komentarji',
 	"srv_diagnostic_4_element_1" 				=> 'na anketo',
 	"srv_diagnostic_4_element_1a" 				=> 'respondentov na anketo',
-	"srv_diagnostic_4_element_2" 				=> 'Število pogojev',
-	"srv_diagnostic_4_element_3" 				=> 'Število blokov',
+	"srv_diagnostic_4_element_2" 				=> 'Pogojev',
+	"srv_diagnostic_4_element_3" 				=> 'Blokov',
 	"srv_diagnostic_4_element_4" 				=> 'Nivo gnezdenja',
-	"srv_diagnostic_4_element_9" 				=> 'Število strani',
-	"srv_diagnostic_4_element_5" 				=> 'Število vprašanj',
-	"srv_diagnostic_4_element_5a" 				=> 'Število skritih vprašanj',
-	"srv_diagnostic_4_element_8" 				=> 'Število spremenljivk',
+	"srv_diagnostic_4_element_9" 				=> 'Strani',
+	"srv_diagnostic_4_element_5" 				=> 'Vprašanj',
+	"srv_diagnostic_4_element_5a" 				=> 'Skritih vprašanj',
+	"srv_diagnostic_4_element_8" 				=> 'Spremenljivk',
 	"srv_diagnostic_4_element_6" 				=> 'na vprašanja',	
 	"srv_diagnostic_4_element_7" 				=> 'respondetov na vprašanja',
 	"srv_diagnostic_5_element_1" 				=> 'Preverjanje pogojev, kalkulacij in zank',
diff --git a/lang/2.php b/lang/2.php
index 79ef91eca..07a83964a 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2170,6 +2170,9 @@ $lang = array (
 	"srv_visible_on"		=>	"Visible",
 	"srv_visible_off"		=>	"Not visible",
 	"srv_hidden_text"		=>  "hidden",
+	"srv_hidden_text2"		=>  "hidden",
+	"srv_hidden_text3"		=>  "hidden",
+	"srv_hidden_text4"		=>  "hidden",
 	"srv_system_text"		=>  "system",
 	"srv_visible_dostop"	=>	"Question is visible",
 	"srv_previewalert"		=>	"You are currently in survey preview mode! Answers will not be saved!",
@@ -3508,7 +3511,9 @@ $lang = array (
 	"srv_info_name"					=>	"Survey name",
 	"srv_info_note"					=>	"Note",
 	"srv_info_questions"			=>	"Questions",
-	"srv_info_questions1"			=>	"N. of questions",
+	"srv_info_questions1"			=>	"Questions",
+	"srv_info_questions2"			=>	"Questions",
+	"srv_info_questions3"			=>	"Questions",
 	"srv_info_variables"			=>	"Variables",
 	"srv_info_pages"				=>	"Pages",
 	"srv_info_answers"				=>	"Answers",
@@ -3990,12 +3995,16 @@ $lang = array (
 	"srv_testiranje"					=>	"Test",			// ime glavne navigacije 3. nivoja (gc 8.3.2012)
 	"srv_testiranje_oblivanje"			=>	"Test data",			
 	"srv_testiranje_cas"				=>	"Actual time",			
+	"srv_testiranje_cas_info"				=>	"More info about actual time",			
 	"srv_testiranje_predvidenicas"		=>	"Estimated duration",
+	"srv_testiranje_predvidenicas_info"		=>	"More info about estimated duration",
 	"srv_testiranje_predvidenicas_1"	=>	"Expected duration",
 	"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",			
@@ -4270,7 +4279,13 @@ $lang = array (
 	"srv_basic"							=>	"Basic",
 	"srv_advanced"						=>	"Advanced options",
 	"srv_pogoj"							=>	"Condition",
+	"srv_pogoj2"							=>	"Conditions",
+	"srv_pogoj3"							=>	"Conditions",
+	"srv_pogoj4"							=>	"Conditions",
 	"srv_blok"							=>	"Block",
+	"srv_blok2"							=>	"Blocks",
+	"srv_blok3"							=>	"Blocks",
+	"srv_blok4"							=>	"Blocks",
 	"srv_calc"							=>	"Calculation",
 	"srv_quota"							=>	"Quota",
 	"srv_zanka"							=>	"Loop",
@@ -4381,6 +4396,9 @@ $lang = array (
 	"srv_export_replace1"				=>	"Character:",
 	"srv_export_replace2"				=>	" in text replaced by:",
 	"srv_spremenljivka"					=>	"Variable",
+	"srv_spremenljivka2"					=>	"Variables",
+	"srv_spremenljivka3"					=>	"Variables",
+	"srv_spremenljivka4"					=>	"Variables",
 	"srv_vrednost"						=>	"Value",
 	"srv_vrednost_default"				=>	"Preset value",
 	"srv_your_base_lang"				=>	"Your basic language is",
@@ -5099,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",
@@ -5400,13 +5419,13 @@ $lang = array (
 	"srv_diagnostic_4_element_0" 				=> 'Comments',
 	"srv_diagnostic_4_element_1" 				=> 'Number of editor survey comments',
 	"srv_diagnostic_4_element_1a" 				=> 'Number of respondent survey comments',
-	"srv_diagnostic_4_element_2" 				=> 'Number of conditions',
-	"srv_diagnostic_4_element_3" 				=> 'Number of blocks',
+	"srv_diagnostic_4_element_2" 				=> 'Conditions',
+	"srv_diagnostic_4_element_3" 				=> 'Blocks',
 	"srv_diagnostic_4_element_4" 				=> 'Levels of nesting',
-	"srv_diagnostic_4_element_9" 				=> 'Number of pages',
-	"srv_diagnostic_4_element_5" 				=> 'Number of questions',
-	"srv_diagnostic_4_element_5a" 				=> 'Number of hidden questions',
-	"srv_diagnostic_4_element_8" 				=> 'Number of variables',
+	"srv_diagnostic_4_element_9" 				=> 'Pages',
+	"srv_diagnostic_4_element_5" 				=> 'Questions',
+	"srv_diagnostic_4_element_5a" 				=> 'Hidden questions',
+	"srv_diagnostic_4_element_8" 				=> 'Variables',
 	"srv_diagnostic_4_element_6" 				=> 'Number of editors in a questionnaire',
 	"srv_diagnostic_4_element_7" 				=> 'Number of respondents in a questionnaire',
 	"srv_diagnostic_5_element_1" 				=> 'Error in conditions, calculations and loops',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f3ca2d031..c60e10f93 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24216,83 +24216,173 @@ 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 div.lastnosti_wrapper div.lastnosti_right {
+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 div.lastnosti_wrapper div.lastnosti_right .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: 150px;
+  font-size: 14px !important;
 }
-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 div.lastnosti_wrapper div.lastnosti_right .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 div.lastnosti_wrapper div.lastnosti_right .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 div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .circle {
-  height: 100px;
-  width: 100px;
+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 div.lastnosti_wrapper div.lastnosti_right .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;
+  justify-content: flex-end;
 }
-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 div.lastnosti_wrapper div.lastnosti_right .box .diagnostic_graph .other_text a {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_left .box .diagnostic_graph .other_text .desc,
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_middle .box .diagnostic_graph .other_text .desc {
+  margin-bottom: 16px;
+}
+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;
+  margin-bottom: 10px;
+}
+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 .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 .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.input_box {
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right {
+  width: 33%;
+}
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box {
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+  display: flex;
+  flex-direction: row;
+  box-sizing: border-box;
+  height: 100%;
+}
+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 .lastnosti_wrapper .lastnosti_right .box .vertical_section .item {
+  font-size: 14px !important;
+  padding: 13px 16px;
+  white-space: nowrap;
+}
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section .item:not(:last-of-type) {
+  border-bottom: 1px solid #E5E5E5;
+}
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second {
+  width: 100%;
+}
+div#srv_diagnostic .lastnosti_wrapper .lastnosti_right .box .vertical_section.second .item {
+  font-weight: 600;
+  text-transform: lowercase;
+}
+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;
 }
 
@@ -25045,6 +25135,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
   .page_vabila #vabila .button_holder #nice_url_holder .buttons {
     margin: 9px 0px 0px 0px !important;
   }
+
   div#vabila div.more div.more_block {
     width: 89% !important;
   }
@@ -29417,15 +29508,15 @@ iframe#ifmcontentstoprint {
 }
 
 .rsdl_bck1 {
-  background-color: rgb(250, 226, 226) !important;
+  background-color: #fae2e2 !important;
 }
 
 .rsdl_bck2 {
-  background-color: rgb(255, 157, 157) !important;
+  background-color: #ff9d9d !important;
 }
 
 .rsdl_bck3 {
-  background-color: rgb(248, 66, 66) !important;
+  background-color: #f84242 !important;
 }
 
 .rsdl_bck4 {
@@ -32854,19 +32945,24 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   #quick_comments_link.newCss {
     display: none;
   }
+
   #firstNavigation ol.right-side {
     display: none;
   }
+
   div.status_advanced {
     flex-direction: column;
   }
+
   div.status_advanced_box {
     width: 100%;
     box-sizing: border-box;
   }
+
   a.status_advanced_link {
     width: 95%;
   }
+
   .content_div_normalmode {
     overflow-x: auto;
   }
@@ -32934,6 +33030,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -32963,36 +33060,44 @@ fieldset textarea {
   fieldset .setting {
     height: auto !important;
   }
+
   .setting_horizontal_wrapper {
     flex-direction: column !important;
   }
+
   #vnosi_paginacija div select {
     display: inline-block;
     width: fit-content;
     margin: 0 5px;
     text-align: center;
   }
+
   div.breadcrumbs {
     display: block;
     padding: 15px;
     color: #1e88e5;
     font-weight: 600;
   }
+
   button.small, submit.small {
     min-width: auto;
     padding: 5px 16px;
   }
+
   button.medium, submit.medium {
     min-width: auto;
     padding: 10px 24px;
   }
+
   button.large, submit.large {
     min-width: auto;
     padding: 12px 32px;
   }
+
   .top_note {
     padding: 8px 16px;
   }
+
   header {
     /* Mobile meni */
     /* Mobile meni - NASTAVITVE V UREJANJU ANKETE*/
@@ -33248,6 +33353,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   header .mobile_settings .mobile_settings_content a .setting_text {
     width: auto;
   }
+
   footer#srv_footer {
     display: flex;
     flex-direction: column;
@@ -33269,6 +33375,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -33279,6 +33386,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     left: 10% !important;
     box-shadow: 0 0 15px 15px rgba(0, 0, 0, 0.34) !important;
   }
+
   .divPopUp {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
@@ -33289,10 +33397,12 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: calc(100% - 32px) !important;
     max-width: calc(100% - 32px) !important;
   }
+
   /* Vse povezano s paketi in placili */
   .dt-buttons {
     display: none;
   }
+
   #main #moje_ankete_edit #anketa_edit {
     padding: 0 !important;
   }
@@ -33370,6 +33480,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit fieldset div.setting {
     margin-bottom: 10px;
   }
+
   #new_anketa_div {
     display: flex;
     flex-direction: column;
@@ -33453,6 +33564,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border: 1px solid #c8e3f8 !important;
     border-radius: 1px;
   }
+
   .dashboard_top_settings {
     flex-direction: column;
   }
@@ -33465,16 +33577,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0;
     margin-right: 16px;
   }
+
   .dashboard_boxes {
     flex-direction: column;
   }
   .dashboard_boxes .dashboard_box {
     margin: 0 0 32px 0;
   }
+
   .locked .add-variable-mobile,
 .spremenljivka_content .add-variable {
     display: none !important;
   }
+
   #branching {
     width: 100%;
     margin: 0;
@@ -33579,9 +33694,11 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin: 0;
     padding: 0 12px;
   }
+
   .toolbox_holder {
     display: none;
   }
+
   .mobile_add_question {
     display: block;
     position: fixed;
@@ -33601,6 +33718,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     line-height: 15px;
     font-weight: 600;
   }
+
   .mobile_add_question_popup {
     z-index: 9999;
     position: fixed;
@@ -33654,6 +33772,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     font-size: 14px;
     font-weight: 500;
   }
+
   #vprasanje_float_editing .vprasanje_edit_holder {
     position: fixed;
     z-index: 99999;
@@ -33706,6 +33825,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     margin-left: 0 !important;
     text-align: center;
   }
+
   #main #anketa #globalSetingsList {
     max-width: 100% !important;
     width: 100% !important;
@@ -33718,6 +33838,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #main #anketa #globalSetingsList fieldset span.charalimit#anketa_note_chars {
     width: 100%;
   }
+
   /* NASTAVITVE in ARHIVI */
   /* OBLIKA */
   #main #anketa #anketa_edit.page_tema #div_theme_group_holder {
@@ -33733,15 +33854,18 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100%;
     height: auto;
   }
+
   #theme-editor {
     width: 100% !important;
     float: none !important;
   }
+
   #theme-preview {
     width: 100% !important;
     float: none !important;
     margin-top: 80px !important;
   }
+
   /* ARHIVI */
   #main #anketa #anketa_edit.page_arhivi {
     flex-direction: column-reverse;
@@ -33759,6 +33883,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #anketa #anketa_edit.page_arhivi #div_archive_content fieldset input {
     width: 100% !important;
   }
+
   div.page_tema .theme_list {
     flex-wrap: wrap;
   }
@@ -33785,6 +33910,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options .button {
     margin-right: 8px;
   }
+
   .page_theme-editor #theme-preview {
     display: none;
   }
@@ -33792,6 +33918,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -33812,6 +33939,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 #srv_diagnostic #srv_diagnostic_results_right table td + td {
     width: auto !important;
   }
+
   .subpage_testnipodatki {
     line-height: 20px;
   }
@@ -33825,6 +33953,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .subpage_testnipodatki form label input {
     vertical-align: bottom;
   }
+
   .lastnosti_wrapper {
     flex-direction: column !important;
   }
@@ -33832,6 +33961,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
 .lastnosti_wrapper .lastnosti_right {
     width: 100% !important;
   }
+
   .page_vabila #vabila .button_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -33856,6 +33986,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_vabila #vabila .more_block {
     width: 100%;
   }
+
   .page_invitations #inv_top_navi {
     flex-direction: column;
     align-items: flex-start;
@@ -33923,6 +34054,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   .page_invitations .button_holder button {
     margin-bottom: 8px;
   }
+
   #vabila > table,
 table.invitations_settings,
 #inv_msg_preview table,
@@ -34006,6 +34138,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -34013,6 +34146,7 @@ table.invitations_settings p label input[type=password],
     margin: 10px 0 !important;
     box-sizing: border-box !important;
   }
+
   #inv_top_navi {
     display: flex;
     flex-direction: column;
@@ -34051,6 +34185,7 @@ table.invitations_settings p label input[type=password],
   #inv_top_navi > #inv_step_nav.yellow .inv_step_space {
     display: none;
   }
+
   #inv_recipients_profiles_holder,
 #inv_import_list_container,
 #inv_messages_profiles_holder,
@@ -34071,6 +34206,7 @@ table.invitations_settings p label input[type=password],
 #inv_select_mail_preview textarea {
     width: 100%;
   }
+
   #inv_msg_preview table th {
     height: auto !important;
     width: 100% !important;
@@ -34082,6 +34218,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -34096,9 +34233,11 @@ table.invitations_settings p label input[type=password],
   .addthis_toolbox .addthis_separator {
     font-size: 16px;
   }
+
   #inv_field_container ul li {
     width: 45%;
   }
+
   /* grafika ko ni podatkov */
   div.no_data_alert img {
     width: 100%;
@@ -34110,6 +34249,7 @@ table.invitations_settings p label input[type=password],
     flex-direction: column;
     align-items: center;
   }
+
   .page_data .data_table_top_holder {
     flex-direction: column;
     align-items: flex-start;
@@ -34180,9 +34320,11 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     margin-bottom: 16px;
   }
+
   body.data_fullscreen #analiza_data {
     top: 68px;
   }
+
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -34223,6 +34365,7 @@ table.invitations_settings p label input[type=password],
     clear: both;
     margin: 40px 0 0 0 !important;
   }
+
   .subpage_quick_edit #quick_edit_top_line {
     flex-direction: column-reverse;
   }
@@ -34242,6 +34385,7 @@ table.invitations_settings p label input[type=password],
   .subpage_quick_edit .quick_edit_container .quick_edit_bottom_line {
     justify-content: center;
   }
+
   .analysis_bottom_settings {
     flex-wrap: wrap;
   }
@@ -34251,13 +34395,16 @@ table.invitations_settings p label input[type=password],
     margin: 0 0 16px 0 !important;
     border: 0;
   }
+
   .div_analiza_icons,
 .div_analiza_scale {
     opacity: 1 !important;
   }
+
   .analysis_icons_holder {
     display: none;
   }
+
   .chart_holder {
     width: 100%;
     box-sizing: border-box;
@@ -34280,6 +34427,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -34296,12 +34444,14 @@ table.analysis_reports > tbody > tr > td {
   table.analysis_reports fieldset {
     margin-bottom: 0 !important;
   }
+
   .reports_holder {
     flex-direction: column;
   }
   .reports_holder fieldset {
     width: 100%;
   }
+
   .noSurvey_sequence {
     padding: 0;
   }
@@ -34323,11 +34473,13 @@ table.analysis_reports > tbody > tr > td {
   .noSurvey_sequence .buttons_holder a .button {
     margin: 10px 30px;
   }
+
   #table-horizontal-scroll-wrapper1-userchanges {
     display: table;
     table-layout: fixed;
     width: 100%;
   }
+
   #table-horizontal-scroll-wrapper2-userchanges {
     display: table-cell;
     overflow-x: auto;
@@ -34338,6 +34490,7 @@ table.analysis_reports > tbody > tr > td {
     border-collapse: collapse;
     white-space: nowrap;
   }
+
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
index c039c4015..182539967 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
@@ -59,15 +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,
-        div.lastnosti_right {
+        .lastnosti_left,
+        .lastnosti_middle {
             width: 33%;
             display: flex;
             flex-direction: column;
@@ -80,6 +79,11 @@ div#srv_diagnostic {
 
                 display: flex;
                 flex-direction: column;
+                box-sizing: border-box;
+
+                min-height: 150px;
+
+                font-size: 14px !important;
 
                 .title {
                     text-transform: uppercase;
@@ -93,29 +97,142 @@ div#srv_diagnostic {
                     margin-top: -8px;
 
                     .circle {
-                        height: 100px;
-                        width: 100px;
+                        height: 88px;
+                        width: 88px;
                         margin-right: 16px;
                     }
 
                     .other_text {
                         display: flex;
                         flex-direction: column;
-                        justify-content: center;
-                        gap: 16px;
+                        justify-content: flex-end;
+
+                        .desc {
+                            margin-bottom: 16px;
+                        }
 
                         a {
                             text-decoration: none;
                             font-size: 14px !important;
                             white-space: nowrap;
+                            margin-bottom: 10px;
+                        }
+                    }
+                }
+
+                .time {
+                    font-size: 32px;
+                    margin-bottom: 12px;
+                    
+                    span.time_text {
+                        font-size: 14px !important;
+                    }
+                }
+
+                a {
+                    text-decoration: none;
+                    font-size: 14px !important;
+                    white-space: nowrap;
+                }
+            }
+        }
+
+        .lastnosti_right {
+            width: 33%;
+
+            .box {
+                border: 1px solid $gray;
+                border-radius: 2px;
+
+                display: flex;
+                flex-direction: row;
+                box-sizing: border-box;
+
+                height: 100%;
+                
+                .vertical_section {
+                    display: flex;
+                    flex-direction: column;
+                    box-sizing: border-box;
+                    justify-content: space-between;
+                    
+                    .item {
+                        font-size: 14px !important;
+                        padding: 13px 16px;
+                        white-space:nowrap;
+
+                        &:not(:last-of-type) {
+                        border-bottom: 1px solid $gray;
+                        }
+                    }
+
+                    &.second {
+                        width: 100%;
+
+                        .item {
+                            font-weight: $semi-bold;
+                            text-transform: lowercase;
                         }
                     }
                 }
             }
+
         }
         
     }
-    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;
@@ -132,7 +249,7 @@ div#srv_diagnostic {
         }
     }
 
-    div.button_holder {
+    .button_holder {
         align-items: center;
         margin-bottom: 0;
         button {
diff --git a/resources/sass/frontend_simple/basic/popravki.scss b/resources/sass/frontend_simple/basic/popravki.scss
index 24592d2c3..c089f8390 100644
--- a/resources/sass/frontend_simple/basic/popravki.scss
+++ b/resources/sass/frontend_simple/basic/popravki.scss
@@ -280,20 +280,6 @@ footer .footer_content .col3 .social_logo_flex a:first-of-type{
 }
   
 
-
-//CAPTCHA
-iframe {
-    max-width: 304px;
-    width: unset;
-}
-
-.rc-anchor-normal .rc-anchor-checkbox-label{
-    max-width: 152px;
-    width: unset;
-}
-
-
-
 //------------- POPRAVKI ( napačno geslo, elektronski naslov etc.)--------------------------
 
 
diff --git a/resources/sass/frontend_simple/modules/landing_page.scss b/resources/sass/frontend_simple/modules/landing_page.scss
index 86c557c40..cbc469a32 100644
--- a/resources/sass/frontend_simple/modules/landing_page.scss
+++ b/resources/sass/frontend_simple/modules/landing_page.scss
@@ -155,7 +155,7 @@ body.login_noEmail{
                 display: flex;
                 align-items: baseline;
 
-                margin: 17px 0 5px 0;
+                margin: 16px 0 0 0;
 
                 input{
                     margin-right: 10px;
@@ -184,8 +184,7 @@ body.login_noEmail{
             }
 
             .g-recaptcha{
-                width: 304px;
-                margin-top: 20px;
+                margin-top: 16px;
             }
         }
     }
diff --git a/sql/update2.sql b/sql/update2.sql
index 5b54fd030..4deec8e6f 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9633,15 +9633,14 @@ CREATE TABLE kolektor_survey_response(
     CONSTRAINT fk_kolektor_survey_response_usr_id FOREIGN KEY (usr_id) REFERENCES users (id) ON DELETE CASCADE ON UPDATE CASCADE,
     CONSTRAINT fk_kolektor_survey_response_kolektor_client_id FOREIGN KEY (kolektor_client_id) REFERENCES kolektor_client (id) ON DELETE CASCADE ON UPDATE CASCADE,
     CONSTRAINT fk_kolektor_survey_response_respondent_id FOREIGN KEY (respondent_id) REFERENCES srv_user (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    PRIMARY KEY (id),
+    PRIMARY KEY (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE kolektor_survey_response_alert(
     kolektor_survey_response_id INT(11) NOT NULL,
     alert_time DATETIME(3) NOT NULL,
     status ENUM('0','1','2','3','4') NOT NULL,
-    CONSTRAINT kolektor_survey_response_alert_kolektor_survey_response_id FOREIGN KEY (kolektor_survey_response_id) REFERENCES kolektor_survey_response (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    PRIMARY KEY (id)
+    CONSTRAINT kolektor_survey_response_alert_kolektor_survey_response_id FOREIGN KEY (kolektor_survey_response_id) REFERENCES kolektor_survey_response (id) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE kolektor_podjetje_funkcija(