diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 4e26eba5c..c2bdb130f 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -2636,10 +2636,12 @@ class SurveyAdmin
     private function displayAnketaTabTestiranje(){
         if ($_GET['a'] == 'komentarji') {
             $sas = new SurveyAdminSettings();
+            $sas->menu_komentarji();
             $sas->testiranje_komentarji();
         } 
         elseif ($_GET['a'] == 'komentarji_anketa') {
             $sas = new SurveyAdminSettings();
+            $sas->menu_komentarji();
             $sas->testiranje_komentarji_anketa();
         }
         elseif (trim($_GET['m']) == '' || $_GET['m'] == 'diagnostika') {
@@ -3553,6 +3555,9 @@ class SurveyAdmin
             elseif($_GET['m'] == 'all'){
 	            $sas->allUsersList();
             }
+            elseif($_GET['m'] == 'add'){
+	            $sas->dodeljeniUporabniki();
+            }
             else {
 	            $sas->assignedUsersList();
             }
@@ -3636,6 +3641,10 @@ class SurveyAdmin
                 $sas = new SurveyAdminSettings();
                 $sas->globalUserMyProfile();
             }
+            if ($_GET['m'] == 'global_user_ChangeArchive') {
+                $sas = new SurveyAdminSettings();
+                $sas->globalUserChangeArchive();
+            }
             echo '</div>';
         }
 
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 3573c5588..8feffcfaa 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -4916,6 +4916,11 @@ class SurveyAdminAjax {
 			
 			sisplet_query("UPDATE post SET vsebina='$vsebina' WHERE id='$id'");
 			
+		} elseif ($_GET['a'] == 'comment_delete') {
+			$id = $_POST['id'];
+			
+			$sql = sisplet_query("DELETE FROM post WHERE id='$id'");
+			
 		} elseif ($_GET['a'] == 'archivePopup') {
 			echo '<div class="survey_archive_popup">';
 			$sas = new SurveyAdminSettings();
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index b1870a6ca..922e72d99 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1879,45 +1879,21 @@ class SurveyAdminSettings {
 			echo '</div>';
 			
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_sledenje_browser'].':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_browser" id="survey_browser_1" value="1"'.($browser==1?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_browser_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_browser" id="survey_browser_0" value="0"'.($browser==0?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_browser_0">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_browser" value="1">';
+            echo '<input type="checkbox" id="survey_browser" name="survey_browser" value="0" '.($browser==0? ' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_browser">'. $lang['srv_sledenje_browser'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
-            echo '<span class="setting_title">'.$lang['srv_sledenje_referal'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_referal" id="survey_referal_1" value="1"'.($referal==1?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_referal_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_referal" id="survey_referal_0" value="0"'.($referal==0?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_referal_0" >'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_referal" value="1">';
+            echo '<input type="checkbox" id="survey_referal" name="survey_referal" value="0" '.($referal==0? ' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_referal">'. $lang['srv_sledenje_referal'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
-            echo '<span class="setting_title">'.$lang['srv_sledenje_date'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_date" id="survey_date_1" value="1"'.($date==1?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_date_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_date" id="survey_date_0" value="0"'.($date==0?' checked':'').' '.$voting_disabled.'>';
-            echo '<label for="survey_date_0">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_date" value="1">';
+            echo '<input type="checkbox" id="survey_date" name="survey_date" value="0" '.($date==0? ' checked':'').' '.$voting_disabled.'>';
+            echo '<label for="survey_date">'. $lang['srv_sledenje_date'] .'</label> ';
 			echo '</div>';
 
 			echo '</fieldset>';
@@ -1928,17 +1904,9 @@ class SurveyAdminSettings {
 
 			//Shranjuj IP naslov respondenta
 			echo '<div class="setting_holder '.(($ip == 0) ? '' : ' bottom0').'" id="save_IP">';
-			echo '<span class="setting_title">'.$lang['srv_sledenje_ip'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_ip" id="survey_ip_1" value="1"'.($ip==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-            echo '<label for="survey_ip_1">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_ip" id="survey_ip_0" value="0"'.($ip==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-            echo '<label for="survey_ip_0">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_ip" value="1">';
+            echo '<input type="checkbox" id="survey_ip" name="survey_ip" value="0" '.($ip==0? ' checked':'').' '.$voting_disabled.' onChange="toggleParapodatki();">';
+            echo '<label for="survey_ip">'. $lang['srv_sledenje_ip'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class=" '.(($ip == 1 && $ip_show == 0) ? 'displayNone' : '').'" id="save_IP_warning">';
@@ -1950,17 +1918,9 @@ class SurveyAdminSettings {
 			echo '<div class="'.(($ip == 0) ? '' : ' displayNone').'" id="connect_IP">';
 
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title">'.$lang['srv_show_ip'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_0" value="0"'.($ip_show==0?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-			echo '<label for="survey_show_ip_0">'.$lang['no'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="survey_show_ip" id="survey_show_ip_1" value="1"'.($ip_show==1?' checked':'').' '.$voting_disabled.' onClick="toggleParapodatki();">';
-			echo '<label for="survey_show_ip_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="survey_show_ip" value="0">';
+            echo '<input type="checkbox" id="survey_show_ip" name="survey_show_ip" value="1" '.($ip_show==1? ' checked':'').' '.$voting_disabled.' onChange="toggleParapodatki();">';
+            echo '<label for="survey_show_ip">'. $lang['srv_show_ip'] .'</label> ';
 			echo '</div>';
 
 			echo '<div class=" '.(($ip_show == 1) ? '' : ' displayNone').'" id="connect_IP_warning">';
@@ -2012,49 +1972,25 @@ class SurveyAdminSettings {
 			// Številčenje vprašanj (default da)
 			$export_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_numbering');
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title" >'.$lang['srv_nastavitveStevilcenje'].':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_numbering" id="export_numbering_1" '.($export_numbering==='1'?' checked':'').' value="1">';
-			echo '<label for="export_numbering_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_numbering" id="export_numbering_0" '.($export_numbering!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_numbering_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-
+			echo '<input type="hidden" name="export_numbering" value="0">';
+            echo '<input type="checkbox" id="export_numbering" name="export_numbering" value="1" '.($export_numbering==='1'?' checked':'').'>';
+            echo '<label for="export_numbering">'. $lang['srv_nastavitveStevilcenje'] .'</label> ';
 			echo '</div>';
 
 			// Prikaz pogojev (default da)
 			$export_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_show_if');
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title" >'.$lang['srv_export_if'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_if" id="export_show_if_1" '.($export_show_if==='1'?' checked':'').' value="1">';
-			echo '<label for="export_show_if_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_if" id="export_show_if_0" '.($export_show_if!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_show_if_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-								
+			echo '<input type="hidden" name="export_show_if" value="0">';
+            echo '<input type="checkbox" id="export_show_if" name="export_show_if" value="1" '.($export_show_if==='1'?' checked':'').'>';
+            echo '<label for="export_show_if">'. $lang['srv_export_if'] .'</label> ';
 			echo '</div>';
 
 			// Prikazi uvoda (default ne)
 			$export_show_intro = SurveySetting::getInstance()->getSurveyMiscSetting('export_show_intro');
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title" >'.$lang['srv_export_intro'].':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_intro" id="export_show_intro_1" '.($export_show_intro==='1'?' checked':'').' value="1">';
-			echo '<label for="export_show_intro_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_intro" id="export_show_intro_0" '.($export_show_intro!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_show_intro_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="exporexport_show_introt_show_if" value="0">';
+            echo '<input type="checkbox" id="export_show_intro" name="export_show_intro" value="1" '.($export_show_intro==='1'?' checked':'').'>';
+            echo '<label for="export_show_intro">'. $lang['srv_export_intro'] .'</label> ';
 			echo '</div>';
 
 			echo '</fieldset>';
@@ -2064,113 +2000,76 @@ class SurveyAdminSettings {
 			echo '<fieldset>';	
 			echo '<legend>'.$lang['srv_export_results_settings'].'</legend>';
 
+
+			// Številčenje vprašanj (default da)
+			$export_data_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_numbering');
 			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_numbering" value="0">';
+            echo '<input type="checkbox" id="export_data_numbering" name="export_data_numbering" value="1" '.($export_data_numbering==='1'?' checked':'').'>';
+            echo '<label for="export_data_numbering">'. $lang['srv_nastavitveStevilcenje'] .'</label> ';
+			echo '</div>';
+
+			
+			// Prikaz recnuma (default da)
+			$export_data_show_recnum = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_recnum');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_show_recnum" value="0">';
+            echo '<input type="checkbox" id="export_data_show_recnum" name="export_data_show_recnum" value="1" '.($export_data_show_recnum==='1'?' checked':'').'>';
+            echo '<label for="export_data_show_recnum">'. $lang['srv_export_show_recnum'] .'</label> ';
+			echo '</div>';
+			
+
+			// Prikaz pogojev (default da)
+			$export_data_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_if');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_show_if" value="0">';
+            echo '<input type="checkbox" id="export_data_show_if" name="export_data_show_if" value="1" '.($export_data_show_if==='1'?' checked':'').'>';
+            echo '<label for="export_data_show_if">'. $lang['srv_export_if'] .'</label> ';
+			echo '</div>';
+
+			
+			// Page break med posameznimi respondenti (default ne)
+			$export_data_PB = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_PB');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_PB" value="0">';
+            echo '<input type="checkbox" id="export_data_PB" name="export_data_PB" value="1" '.($export_data_PB==='1'?' checked':'').'>';
+            echo '<label for="export_data_PB">'. $lang['srv_export_pagebreak'] .'</label> ';
+			echo '</div>';
+
+			
+			// Izpusti vprasanja brez odgovora (default ne)
+			$export_data_skip_empty = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_skip_empty" value="0">';
+            echo '<input type="checkbox" id="export_data_skip_empty" name="export_data_skip_empty" value="1" '.($export_data_skip_empty==='1'?' checked':'').'>';
+            echo '<label for="export_data_skip_empty">'. $lang['srv_export_skip_empty'] .'</label> ';
+			echo '</div>';
+			
+
+			// Izpusti podvprasanja brez odgovora (default ne)
+			$export_data_skip_empty_sub = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty_sub');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_skip_empty_sub" value="0">';
+            echo '<input type="checkbox" id="export_data_skip_empty_sub" name="export_data_skip_empty_sub" value="1" '.($export_data_skip_empty_sub==='1'?' checked':'').'>';
+            echo '<label for="export_data_skip_empty_sub">'. $lang['srv_export_skip_empty_sub'] .'</label> ';
+			echo '</div>';
 
 			// Tip izvoza (1->dolg oz. razsirjen, 2->kratek oz. skrcen)
+			echo '<div class="setting_holder">';
 			$export_data_type = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_type');
 			echo '<label for="export_data_type">'.$lang['srv_displaydata_type'];
 			echo Help :: display('displaydata_pdftype');
 			echo ':</label>';
-			echo '<select name="export_data_type" id="export_data_type" class="dropdown large">';
-			echo '	<option value="2"'.((int)$export_data_type == 2 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type2'] . '</option>';
-			echo '	<option value="1"'.((int)$export_data_type == 1 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type1'] . '</option>';
-			echo '</select>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_data_type" id="export_data_type2" '.((int)$export_data_type == 2 ? ' checked':'').' value="2">';
+			echo '<label for="export_data_type2">'.$lang['srv_displaydata_type2'].'</label> ';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_data_type" id="export_data_type1" '.((int)$export_data_type == 1 ?' checked':'').' value="1">';
+			echo '<label for="export_data_type1">'.$lang['srv_displaydata_type1'].'</label> ';
 			echo '</div>';
 
-			echo '<div class="setting_holder">';
-			
-			// Številčenje vprašanj (default da)
-			$export_data_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_numbering');
-			echo '<span class="setting_title" >'.$lang['srv_nastavitveStevilcenje'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_numbering" id="export_data_numbering_1" '.($export_data_numbering==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_numbering_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_numbering" id="export_data_numbering_0" '.($export_data_numbering!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_numbering_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
-			echo '<div class="setting_holder">';
-			
-			// Prikaz recnuma (default da)
-			$export_data_show_recnum = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_recnum');
-			echo '<span class="setting_title" >'.$lang['srv_export_show_recnum'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_recnum" id="export_data_show_recnum_1" '.($export_data_show_recnum==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_show_recnum_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_recnum" id="export_data_show_recnum_0" '.($export_data_show_recnum!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_show_recnum_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-			
-			echo '<div class="setting_holder">';
-
-			// Prikaz pogojev (default da)
-			$export_data_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_if');
-			echo '<span class="setting_title" >'.$lang['srv_export_if'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_if" id="export_data_show_if_1" '.($export_data_show_if==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_show_if_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_if" id="export_data_show_if_0" '.($export_data_show_if!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_show_if_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
-			echo '<div class="setting_holder">';
-			
-			// Page break med posameznimi respondenti (default ne)
-			$export_data_PB = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_PB');
-			echo '<span class="setting_title" >'.$lang['srv_export_pagebreak'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_PB" id="export_data_PB_1" '.($export_data_PB==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_PB_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_PB" id="export_data_PB_0" '.($export_data_PB!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_PB_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
-			echo '<div class="setting_holder">';
-			
-			// Izpusti vprasanja brez odgovora (default ne)
-			$export_data_skip_empty = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty');
-			echo '<span class="setting_title" >'.$lang['srv_export_skip_empty'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty" id="export_data_skip_empty_1" '.($export_data_skip_empty==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_skip_empty_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty" id="export_data_skip_empty_0" '.($export_data_skip_empty!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_skip_empty_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-			
-			echo '<div class="setting_holder">';
-
-			// Izpusti podvprasanja brez odgovora (default ne)
-			$export_data_skip_empty_sub = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty_sub');
-			echo '<span class="setting_title" >'.$lang['srv_export_skip_empty_sub'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty_sub" id="export_data_skip_empty_sub_1" '.($export_data_skip_empty_sub==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_skip_empty_sub_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty_sub" id="export_data_skip_empty_sub_0" '.($export_data_skip_empty_sub!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_skip_empty_sub_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
 			echo '</div>';
 				
 			echo '</fieldset>';
@@ -6846,56 +6745,77 @@ class SurveyAdminSettings {
 		
 		return $txt;
 	}
-	
-	/**
-	* izpise komentarje na anketo - stara ki se ne uporablja
-	* 
-	*/
-	function testiranje_komentarji_anketa_old () {
-		global $lang;
-		global $site_url;
-		global $admin_type;
-		global $global_user_id;
-		
-		$rowa = SurveyInfo::getInstance()->getSurveyRow();
-		
-		SurveySetting::getInstance()->Init($this->anketa);
-		$sortpostorder = SurveySetting::getInstance()->getSurveyMiscSetting('sortpostorder');
 
-		$f = new Forum;
-		
-		$sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]'");
-		
-		echo '<div style="padding:0 20px">';
-		echo '<p><b>'.$lang['srv_admin_s_comments'].'</b></p>';
-		
-		if (mysqli_num_rows($sql) > 0) {
-			$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']).'" />';
-		}
-	
-		$i=0;
-		while ($row = mysqli_fetch_array($sql)) {
-			
-			if (($i != 0 && $sortpostorder==0) || ($i < $rows-1 && $sortpostorder==1)) {
-				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:lightgray">';
-					elseif ($row['ocena'] == 3) echo '<span style="color:lightgray">';
-					else echo '<span>';
-				
-				echo '<b>'.$f->user($row['uid']).'</b> ('.$f->datetime1($row['time']).'):';
-				echo '<br/>'.$row['vsebina'].'<hr>';
-				
-				echo '</span>';
-			}
-			$i++;
-		}
-		
+	function menu_komentarji () {
+		global $lang;
+
+		// Prestejemo komentarje (nereseni/vsi)
+		$sas = new SurveyAdminSettings();
+		$comment_count = $sas->testiranje_komentarji_count();
+
+		echo '<div id="additional_navigation">';
+		echo '<div id="menu">';
+
+		// Komentarji na vprasanja
+		echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
+
+		echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
+		echo $lang['srv_testiranje_komentarji_anketa_title'];
+		echo '</a>';
+
+		echo '<span class="bold">(';
+		if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
+			echo '<span class="orange">';
+		echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
+		if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
+			echo '</span>';
+		echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']);
+		echo ')</span>';
+
+		echo '</span>';
+
+
+		// Komentarji na anketo
+		echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
+
+		echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
+		echo $lang['srv_testiranje_komentarji_title'];
+		echo '</a>';
+
+		echo '<span class="bold">(';
+		if ($comment_count['question']['unresolved'] > 0)
+			echo '<span class="orange">';
+		echo $comment_count['question']['unresolved'];
+		if ($comment_count['question']['unresolved'] > 0)
+			echo '</span>';
+		echo '/' . $comment_count['question']['all'];
+		echo ')</span>';
+
+		echo '</span>';
+
+
+		echo '</div>'; //#menu
+
+		//Link na nastavitev komentarjev
+		$d = new Dostop();
+
+            # nastavitve komentarjev
+            if ($d->checkDostopSub('edit')) {
+                echo '<div id="analiza_right_options_holder" class="right_options_holder">';
+
+                echo '<div title="' . $lang['settings'] . '" id="analiza_right_options">';
+                echo '<a href="index.php?anketa=' . $this->sid . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
+                echo '<span class="faicon wheel_32"></span>';
+                echo '</a>';
+                echo '</div>';
+
+                echo '</div>';
+            }
+
 		echo '</div>';
-		
+
 	}
-	
+
 	/**
 	* izpise komentarje na anketo
 	* 
@@ -6974,8 +6894,9 @@ class SurveyAdminSettings {
 		echo '<div class="comment_type">';
 
 		echo $lang['srv_admin_comment'].':';
-		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
-		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+		/*Sort
+		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
+		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
 		
 		echo '</div>';
 
@@ -7036,7 +6957,7 @@ class SurveyAdminSettings {
 							echo '</div>';
 							
 							echo '<div class="line">';
-							echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris - js preko ajaxa pošlje id komentarja in zbriše komentar v bazi in comment box div, da ne refesha strani
+							echo '<span class="faicon trash empty link-right"></span>';
 							echo $lang['srv_comment_delete'];
 							echo '</div>';
 							
@@ -7092,8 +7013,9 @@ class SurveyAdminSettings {
 		
 		echo '<div class="comment_type">';
 		echo $lang['srv_repondent_comment'].':';
-		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
-		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+		/*Sort
+		echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
+		echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
 		echo '</div>';
 		
 		$sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby");
@@ -7140,12 +7062,13 @@ class SurveyAdminSettings {
 
 						echo '<div class="options_dropdown displayNone" id="options_'.$row['id'].'">';
 						
+						/* pri splošnih komentarjih ni odgovorov
 						echo '<div class="line">';
-						echo '<span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment']; // pri splošnih ni odgovorov?
-						echo '</div>';
+						echo '<span class="faicon fa-reply link-right"></span>'.$lang['srv_comment_comment']; 
+						echo '</div>';*/
 						
 						echo '<div class="line">';
-						echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+						echo '<span class="faicon trash empty link-right"></span>';
 						echo $lang['srv_comment_delete'];
 						echo '</div>';
 						
@@ -7605,8 +7528,9 @@ class SurveyAdminSettings {
 
                                 echo $lang['srv_admin_comment'].':';
 
-								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
-								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+								/*Sort
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
                                 
                                 echo '</div>';
 
@@ -7796,8 +7720,9 @@ class SurveyAdminSettings {
 
 								echo $lang['srv_admin_comment'].':';
 
-								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
-								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+								/*Sort
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
 								
 								echo '</div>';
 						
@@ -7838,8 +7763,8 @@ class SurveyAdminSettings {
 											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 class="line">';
-											echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+											echo '<div class="line" onClick="comment_delete(\''.$rowt['id'].'\');">';
+											echo '<span class="faicon trash empty link-right"></span>';
 											echo $lang['srv_comment_delete'];
 											echo '</div>';
 											
@@ -7891,8 +7816,9 @@ class SurveyAdminSettings {
 
 								echo '<div class="comment_type">';
 								echo $lang['srv_repondent_comment'].':';
-								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>'; //manjka funkcija za sort in toggle za spremembo ikone
-								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';
+								/*Sort
+								echo '<span class="faicon pointer blue fa-sort-amount-down"></span>';
+								echo '<span class="faicon pointer blue fa-sort-amount-up"></span>';*/
 								echo '</div>';
 
 								if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " ";
@@ -7946,7 +7872,7 @@ class SurveyAdminSettings {
 												echo '<div class="options_dropdown displayNone" id="options_'.$rowt['id'].'">';
 												
 												echo '<div class="line">';
-												echo '<span class="faicon trash link-right"></span>'; //manjka funkcija za izbris
+												echo '<span class="faicon trash empty link-right"></span>'; //manjka funkcija za izbris
 												echo $lang['srv_comment_delete'];
 												echo '</div>';
 												
@@ -9194,10 +9120,37 @@ class SurveyAdminSettings {
 	    global $lang;
 	    global $global_user_id;
 
-        // managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
+		// managerji in admini lahko dodajajo uporabnike, ki jih nato managirajo
         if( !($admin_type == 1 || $admin_type == 0) )
             return '';
 
+		// Dodajanje uporabnikov
+
+		echo '<fieldset><legend>'.$lang['n_users_list_add'].'</legend>';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_users_add_new_type'].'</span>';
+		
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="user_add_type_1" name="user_add_type" value="1" checked="checked" onClick="toggleAddUser();">';
+		echo '<label for="user_add_type_1">'. $lang['srv_users_add_new_type1'] .'</label> ';
+		echo '</div>';
+		echo '<div class="setting_item">';
+		echo '<input type="radio" id="user_add_type2" name="user_add_type" value="2" onClick="toggleAddUser();">';
+		echo '<label for="user_add_type2">'. $lang['srv_users_add_new_type2'] .'</label> ';
+		echo '</div>';
+		
+		echo '</div>';
+
+		echo '<div id="new_user_option">';
+		echo 'new user!!!';
+		echo '</div>';
+
+		echo '<div id="existing_user_option" class="displayNone">';
+		echo 'existing user -----';
+		echo '</div>';
+
+
 		echo '<p class="bottom16 caps semi-bold">'.$lang['srv_users_add_assigned'].'</p>';
 
         // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET
@@ -9320,6 +9273,9 @@ class SurveyAdminSettings {
         echo '</div>';
         echo '</div>';
 
+        echo '</fieldset>';
+
+
     }
 
 	/**
@@ -9373,16 +9329,6 @@ class SurveyAdminSettings {
         $sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'");
         $rowU = mysqli_fetch_array($sqlU);
 
-        
-        // Dodajanje uporabnikov
-        echo '<div class="add_user">';
-
-        // Manager ali admin lahko doda novega uporabnika pod pregled
-		$this->dodeljeniUporabniki();
-
-        echo '</div>';
-
-
 		// PREGLED NAD UPORABNIKI - TABELA
         echo '<div class="my_users_list_holder">';
 
@@ -10611,6 +10557,24 @@ class SurveyAdminSettings {
             }
         }
 		
+		echo '</fieldset>';	
+                
+		echo '</div>';
+	}
+
+	function globalUserChangeArchive () {
+		global $lang, $global_user_id, $admin_type, $site_domain, $site_url;
+		
+		// podatki prijavljenega uporabnika
+		$sql = sisplet_query("SELECT id, name, surname, email, type, gdpr_agree, last_login FROM users WHERE id = '$global_user_id'");
+		$row = mysqli_fetch_array($sql);
+		
+		echo '<div id="anketa_edit">';
+		
+		echo '	<form name="settingsanketa" id="form_profile_user_settings" action="ajax.php?a=editanketasettings&m=global_user_ChangeArchive" method="post" autocomplete="off">' . "\n\r";
+		echo '		<input type="hidden" name="location" value="' . $_GET['a'] . '" />' . "\n\r";
+		echo '		<input type="hidden" name="submited" value="1" />' . "\n\r";
+		
 
 		// Tabela aktivnosti (prijav)
 		echo '<fieldset><legend>'.$lang['srv_login_tracking_title'].'</legend>';
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 11345ac4e..3df036ee1 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -247,11 +247,17 @@ class SurveyList {
                 if ($admin_type == 0) {
 					echo '<ul class="secondNavigation">';
 
-                    #zavihek osnovni pregled uporabnikov
+                    #zavihek moji uporabniki
 					echo '<li class="'.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'">';
-					echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
 					echo $lang['n_users_list'].'</a>';
                     echo '</li>';
+
+					#zavihek dodajanje uporabnikov
+					echo '<li class="'.($_GET['m'] == 'add' ? 'active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki&m=add" title="'.$lang['n_users_list_add'].'">';
+					echo $lang['n_users_list_add'].'</a>';
+                    echo '</li>';
                     
 					#zavihek seznam vseh uporabnikov
 					echo '<li class="'.($_GET['m'] == 'all' ? 'active' : '').'">';
@@ -291,9 +297,9 @@ class SurveyList {
 
 					echo '<ul class="secondNavigation">';
 
-                    #zavihek osnovni pregled uporabnikov
+                    #zavihek moji uporabniki
 					echo '<li class="active">';
-					echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list'].'">';
 					echo $lang['n_users_list'].'</a>';
                     echo '</li>';
                     
@@ -416,8 +422,23 @@ class SurveyList {
             echo '<a href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
             echo $lang['edit_data'] . '</a>';
             echo '</li>';
-			
+
 			echo '</ul>';
+
+			echo '<div class="separator"></div>';
+
+			// Arhiv sprememb
+			echo '<ul class="secondNavigationArchive">';
+
+            echo '<li class="'.($tab == 'global_user_ChangeArchive' ? ' active' : '').'">';
+            echo '<a href="index.php?a=nastavitve&amp;m=global_user_ChangeArchive" title="' . $lang['srv_survey_archives_tracking_archive'] . '">';
+            echo $lang['srv_survey_archives_tracking_archive'] . '</a>';
+            echo '</li>';
+
+			echo '</ul>';
+
+			
+			
 		}
 		#podnavigacija za obvestila
         if(($_GET['a']=='obvestila')) {
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index 2fc6568ce..d565ca284 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -374,57 +374,6 @@ class SurveyStaticHtml
 
             echo '<span class="active"><a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_CAS . '" title="' . $lang['srv_testiranje_cas'] . '">'.$lang['srv_testiranje_cas'].'</a></span>';
 
-            echo '</div>';
-
-            $borderLeft = ' class="borderLeft"';
-        } 
-        // Link nazaj na komentarje
-        elseif ($podstran == 'komentarji' || $podstran == 'komentarji_anketa') {
-
-            // Prestejemo komentarje (nereseni/vsi)
-            $sas = new SurveyAdminSettings();
-            $comment_count = $sas->testiranje_komentarji_count();
-
-            echo '<div id="additional_navigation">';
-
-            // Komentarji na vprasanja
-            echo '<span '.($_GET['a'] == A_KOMENTARJI_ANKETA ? 'class="active"' : '').'>';
-
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI_ANKETA . '" title="' . $lang['srv_testiranje_komentarji_anketa_title'] . '">';
-            echo $lang['srv_testiranje_komentarji_anketa_title'];
-            echo '</a>';
-
-            echo '<span class="bold">(';
-            if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
-                echo '<span class="orange">';
-            echo($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved']);
-            if ($comment_count['survey_resp']['unresolved'] + $comment_count['survey_admin']['unresolved'] > 0)
-                echo '</span>';
-            echo '/' . ($comment_count['survey_resp']['all'] + $comment_count['survey_admin']['all']);
-            echo ')</span>';
-
-            echo '</span>';
-
-
-            // Komentarji na anketo
-            echo '<span '.($_GET['a'] == A_KOMENTARJI ? ' class="active"' : '').'>';
-
-            echo '<a href="index.php?anketa=' . $this->sid . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji_title'] . '">';
-            echo $lang['srv_testiranje_komentarji_title'];
-            echo '</a>';
-
-            echo '<span class="bold">(';
-            if ($comment_count['question']['unresolved'] > 0)
-                echo '<span class="orange">';
-            echo $comment_count['question']['unresolved'];
-            if ($comment_count['question']['unresolved'] > 0)
-                echo '</span>';
-            echo '/' . $comment_count['question']['all'];
-            echo ')</span>';
-
-            echo '</span>';
-
-
             echo '</div>';
 
             $borderLeft = ' class="borderLeft"';
@@ -569,24 +518,6 @@ class SurveyStaticHtml
 
             echo '</div>';
         } 
-        // Link na nastavitve komentarjev
-        elseif ($podstran == 'komentarji' || $podstran == 'komentarji_anketa') {
-
-            $d = new Dostop();
-
-            # nastavitve komentarjev
-            if ($d->checkDostopSub('edit')) {
-                echo '<div id="analiza_right_options_holder" class="right_options_holder">';
-
-                echo '<div title="' . $lang['settings'] . '" id="analiza_right_options">';
-                echo '<a href="index.php?anketa=' . $this->sid . '&a=urejanje" title="' . $lang['srv_settings_komentarji1'] . '">';
-                echo '<span class="faicon wheel_32"></span>';
-                echo '</a>';
-                echo '</div>';
-
-                echo '</div>';
-            }
-        } 
 
         echo '</div>';
     }
diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
index b1655d3fb..072970de6 100644
--- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
+++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php
@@ -368,6 +368,11 @@ class MobileSurveyAdmin{
                         'url'   => 'index.php?a=diagnostics&t=uporabniki',
                         'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m'])? 'active' : '')
                     ),
+                    array(
+                        'title' => $lang['n_users_list_add'], 
+                        'url'   => 'index.php?a=diagnostics&t=uporabniki&m=add',
+                        'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
+                    ),
                     array(
                         'title' => $lang['n_users_list_all'], 
                         'url'   => 'index.php?a=diagnostics&t=uporabniki&m=all',
@@ -410,6 +415,11 @@ class MobileSurveyAdmin{
                         'url'   => 'index.php?a=diagnostics&t=uporabniki',
                         'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && !isset($_GET['m']) ? 'active' : '')
 
+                    ),
+                    array(
+                        'title' => $lang['n_users_list_add'], 
+                        'url'   => 'index.php?a=diagnostics&t=uporabniki&m=add',
+                        'active' => ($_GET['a'] == 'diagnostics' && $_GET['t'] == 'uporabniki' && $_GET['m'] == 'add'? 'active' : '')
                     )
                 );
             }
@@ -493,6 +503,12 @@ class MobileSurveyAdmin{
                     'url'   => 'index.php?a=nastavitve&m=global_user_myProfile',
                 'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_myProfile' ? 'active' : '')
 
+                ),
+                array(
+                    'title' => $lang['srv_survey_archives_tracking_archive'], 
+                    'url'   => 'index.php?a=nastavitve&m=global_user_ChangeArchive',
+                'active' => ($_GET['a'] == 'nastavitve' && $_GET['m'] == 'global_user_ChangeArchive' ? 'active' : '')
+
                 ),
             );
         }
diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php
index e2608a876..b57d4aae9 100644
--- a/admin/survey/classes/tracking/UserTrackingClass.php
+++ b/admin/survey/classes/tracking/UserTrackingClass.php
@@ -40,7 +40,7 @@ class UserTrackingClass
         echo '<div id="div_archive_content" class="tracking">';
 
         echo '<fieldset>';
-        echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>';
+        echo '<legend>' . $lang['srv_survey_archives_tracking_history'] . '</legend>';
 
         // Izvoz v Excel
         echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 492d849fa..1575cfd30 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5530,13 +5530,13 @@ function toggleParapodatki(){
 
 	if(survey_ip == '0') {
         $("#save_IP_warning").removeClass('displayNone');
-        $("#save_IP").removeClass('no_margin');
+        $("#save_IP").removeClass('bottom0');
         $("#connect_IP").removeClass('displayNone');
 	}
 
 	else {
         $("#save_IP_warning").addClass('displayNone');
-        $("#save_IP").addClass('no_margin');
+        $("#save_IP").addClass('bottom0');
         $("#connect_IP").addClass('displayNone');
 	}
 
@@ -5678,4 +5678,11 @@ function show_gdpr_messeage(id_sporocila){
 
 function toggleCommentOptions(id) {
 	$("#options_"+id).toggleClass("displayNone");
+}
+
+//Toggle za dodajanje uporabnika (admini in managerji)
+function toggleAddUser(){
+
+	$("#new_user_option").toggleClass('displayNone');
+	$("#existing_user_option").toggleClass('displayNone');
 }
\ No newline at end of file
diff --git a/admin/survey/script/vprasanje.js b/admin/survey/script/vprasanje.js
index 957172bad..0b31c4ce7 100644
--- a/admin/survey/script/vprasanje.js
+++ b/admin/survey/script/vprasanje.js
@@ -762,6 +762,10 @@ function comment_on_comment (id, user, date, spr_id) {
 	$(".options_dropdown").addClass("displayNone");
 }
 
+function comment_delete (id) {
+	$.post("ajax.php?a=comment_delete\', {id: \''+id+'\', anketa: srv_meta_anketa_id}");
+}
+
 
 function change_NG_cancelButton(value){
 	if(value == 1){
diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php
index 8ad167a3e..2141f94f9 100644
--- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php
+++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php
@@ -69,8 +69,31 @@ class CenikController extends ControllerBase
       return $build;
     }
 
-
   /**
+   * Return page ostale storitve.
+   *
+   * @return array
+   */
+  public function ostaleStoritve()
+  {
+    $template_path = $this->getTemplatePath() . 'page--ostale-storitve.html.twig';
+
+    $template = file_get_contents($template_path);
+
+    $build = [
+      'description' => [
+        '#type' => 'inline_template',
+        '#template' => $template,
+        '#context' => $this->getVariables(),
+      ],
+    ];
+
+    return $build;
+  }
+
+
+
+    /**
    * Variables to act as context to the twig template file.
    *
    * @return array
diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml b/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml
index 067c7abe8..37c88f6d7 100644
--- a/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml
+++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml
@@ -26,6 +26,16 @@ trgovina_1ka.nakupovanje_api:
 ## END cenik zasebni ##
 
 
+## Cenik ostale storitve ##
+trgovina_1ka.cenik_ostale_storitve:
+  path: '/cenik/ostale-storitve'
+  defaults:
+    _controller: '\Drupal\trgovina_1ka\Controller\CenikController::ostaleStoritve'
+    _title: 'Ostale storitve'
+  requirements:
+    _access: 'TRUE'
+
+
 ### Return call ###
 trgovina_1ka.narocilo_paypal:
   path: '/narocilo/paypal'
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
index cc2258171..54988435c 100644
--- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
+++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css
@@ -2537,6 +2537,54 @@ a {
   color: #D1D1D1;
 }
 
+.cenik-prikaz {
+  margin-top: -150px;
+}
+.cenik-prikaz .ostale-storitve {
+  padding: 2rem 0;
+}
+.cenik-prikaz .ostale-storitve .compare-row.naslov {
+  text-transform: uppercase;
+}
+.cenik-prikaz .ostale-storitve .compare-row.naslov .cd {
+  font-weight: bold;
+}
+.cenik-prikaz .ostale-storitve .compare-row .compare-col.leftcol {
+  min-width: 56%;
+}
+.cenik-prikaz .ostale-storitve .compare-row .compare-col.bold {
+  font-weight: bold;
+}
+.cenik-prikaz .ostale-storitve .accordion-title-block {
+  width: 100%;
+}
+.cenik-prikaz .ostale-storitve .accordion-title-block .accordion-title {
+  min-width: 60%;
+}
+.cenik-prikaz .ostale-storitve .accordion-title-block .accordion-title.w-70 {
+  min-width: 70%;
+}
+.cenik-prikaz .ostale-storitve .accordion-title-block .accordion-title.title-cena {
+  min-width: 20%;
+}
+.cenik-prikaz .ostale-storitve.w-70 .compare-col {
+  text-align: right;
+}
+.cenik-prikaz .ostale-storitve.w-70 .compare-col.leftcol {
+  text-align: left;
+}
+.cenik-prikaz .ostale-storitve.w-70 .accordion-title-block .accordion-title {
+  min-width: 70%;
+}
+.cenik-prikaz .ostale-storitve.w-70 .accordion-title-block .accordion-title.title-cena {
+  min-width: 20%;
+  text-align: right;
+}
+
+.iskani-rezultat p {
+  color: #333;
+}
+
 @font-face {
   font-family: "webflow-icons";
   src: url("data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMg8SBiUAAAC8AAAAYGNtYXDpP+a4AAABHAAAAFxnYXNwAAAAEAAAAXgAAAAIZ2x5ZmhS2XEAAAGAAAADHGhlYWQTFw3HAAAEnAAAADZoaGVhCXYFgQAABNQAAAAkaG10eCe4A1oAAAT4AAAAMGxvY2EDtALGAAAFKAAAABptYXhwABAAPgAABUQAAAAgbmFtZSoCsMsAAAVkAAABznBvc3QAAwAAAAAHNAAAACAAAwP4AZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADpAwPA/8AAQAPAAEAAAAABAAAAAAAAAAAAAAAgAAAAAAADAAAAAwAAABwAAQADAAAAHAADAAEAAAAcAAQAQAAAAAwACAACAAQAAQAg5gPpA//9//8AAAAAACDmAOkA//3//wAB/+MaBBcIAAMAAQAAAAAAAAAAAAAAAAABAAH//wAPAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEBIAAAAyADgAAFAAAJAQcJARcDIP5AQAGA/oBAAcABwED+gP6AQAABAOAAAALgA4AABQAAEwEXCQEH4AHAQP6AAYBAAcABwED+gP6AQAAAAwDAAOADQALAAA8AHwAvAAABISIGHQEUFjMhMjY9ATQmByEiBh0BFBYzITI2PQE0JgchIgYdARQWMyEyNj0BNCYDIP3ADRMTDQJADRMTDf3ADRMTDQJADRMTDf3ADRMTDQJADRMTAsATDSANExMNIA0TwBMNIA0TEw0gDRPAEw0gDRMTDSANEwAAAAABAJ0AtAOBApUABQAACQIHCQEDJP7r/upcAXEBcgKU/usBFVz+fAGEAAAAAAL//f+9BAMDwwAEAAkAABcBJwEXAwE3AQdpA5ps/GZsbAOabPxmbEMDmmz8ZmwDmvxmbAOabAAAAgAA/8AEAAPAAB0AOwAABSInLgEnJjU0Nz4BNzYzMTIXHgEXFhUUBw4BBwYjNTI3PgE3NjU0Jy4BJyYjMSIHDgEHBhUUFx4BFxYzAgBqXV6LKCgoKIteXWpqXV6LKCgoKIteXWpVSktvICEhIG9LSlVVSktvICEhIG9LSlVAKCiLXl1qal1eiygoKCiLXl1qal1eiygoZiEgb0tKVVVKS28gISEgb0tKVVVKS28gIQABAAABwAIAA8AAEgAAEzQ3PgE3NjMxFSIHDgEHBhUxIwAoKIteXWpVSktvICFmAcBqXV6LKChmISBvS0pVAAAAAgAA/8AFtgPAADIAOgAAARYXHgEXFhUUBw4BBwYHIxUhIicuAScmNTQ3PgE3NjMxOAExNDc+ATc2MzIXHgEXFhcVATMJATMVMzUEjD83NlAXFxYXTjU1PQL8kz01Nk8XFxcXTzY1PSIjd1BQWlJJSXInJw3+mdv+2/7c25MCUQYcHFg5OUA/ODlXHBwIAhcXTzY1PTw1Nk8XF1tQUHcjIhwcYUNDTgL+3QFt/pOTkwABAAAAAQAAmM7nP18PPPUACwQAAAAAANciZKUAAAAA1yJkpf/9/70FtgPDAAAACAACAAAAAAAAAAEAAAPA/8AAAAW3//3//QW2AAEAAAAAAAAAAAAAAAAAAAAMBAAAAAAAAAAAAAAAAgAAAAQAASAEAADgBAAAwAQAAJ0EAP/9BAAAAAQAAAAFtwAAAAAAAAAKABQAHgAyAEYAjACiAL4BFgE2AY4AAAABAAAADAA8AAMAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAADgCuAAEAAAAAAAEADQAAAAEAAAAAAAIABwCWAAEAAAAAAAMADQBIAAEAAAAAAAQADQCrAAEAAAAAAAUACwAnAAEAAAAAAAYADQBvAAEAAAAAAAoAGgDSAAMAAQQJAAEAGgANAAMAAQQJAAIADgCdAAMAAQQJAAMAGgBVAAMAAQQJAAQAGgC4AAMAAQQJAAUAFgAyAAMAAQQJAAYAGgB8AAMAAQQJAAoANADsd2ViZmxvdy1pY29ucwB3AGUAYgBmAGwAbwB3AC0AaQBjAG8AbgBzVmVyc2lvbiAxLjAAVgBlAHIAcwBpAG8AbgAgADEALgAwd2ViZmxvdy1pY29ucwB3AGUAYgBmAGwAbwB3AC0AaQBjAG8AbgBzd2ViZmxvdy1pY29ucwB3AGUAYgBmAGwAbwB3AC0AaQBjAG8AbgBzUmVndWxhcgBSAGUAZwB1AGwAYQByd2ViZmxvdy1pY29ucwB3AGUAYgBmAGwAbwB3AC0AaQBjAG8AbgBzRm9udCBnZW5lcmF0ZWQgYnkgSWNvTW9vbi4ARgBvAG4AdAAgAGcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgAuAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==") format("truetype");
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
index 163a95c21..cc3ce7796 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
+++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js
@@ -166,6 +166,11 @@
         }
         /*** end quictabs ***/
 
+        //Cenik
+        if(urlPars[3] == 'cenik' || urlPars[3] == 'prices'){
+          jQuery('h1.page-title').hide();
+        }
+
         /** gumb svetovanje **/
         if(urlPars[3] == 'pomoc' || urlPars[3] == 'iskanje'){
           jQuery('.container h1').append('<div class="w-clearfix gumb-svetovanje"><div class="besedilo">Individualno <br />svetovanje</div></div>');
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme
index 776fd045f..f010792f8 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme
+++ b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme
@@ -12,7 +12,7 @@ function pro1ka_preprocess_page(&$variables) {
 
   $variables['lang'] = $lang;
   $variables['uporabnik'] = (!empty($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : false);
-  $variables['emailUporabnik'] = 'da'.(!empty($_COOKIE['uid']) ? base64_decode($_COOKIE['uid']) : false);
+  $variables['emailUporabnik'] = (!empty($_COOKIE['uid']) ? base64_decode($_COOKIE['uid']) : false);
 }
 
 /**
@@ -22,32 +22,3 @@ function pro1ka_preprocess_menu(&$variables) {
   $variables['attributes']['class'][] = 'menu-1ka';
 }
 
-
-//function pro1ka_preprocess_menu_local_task(&$variables) {
-//  dd($variables);
-//  $link = $variables['element']['#link'];
-//  $link += array(
-//    'localized_options' => array(),
-//  );
-//  $link_text = $link['title'];
-//  if (!empty($variables['element']['#active'])) {
-//    $variables['is_active'] = TRUE;
-//
-//    // Add text to indicate active tab for non-visual users.
-//    $active = SafeMarkup::format('<span class="visually-hidden">@label</span>', array(
-//      '@label' => t('(active tab)'),
-//    ));
-//    $link_text = t('@local-task-title@active', array(
-//      '@local-task-title' => $link_text,
-//      '@active' => $active,
-//    ));
-//  }
-//  $link['localized_options']['set_active_class'] = TRUE;
-//  $variables['link'] = array(
-//    '#type' => 'link',
-//    '#title' => $link_text,
-//    '#url' => $link['url'],
-//    '#options' => $link['localized_options'],
-//  );
-//}
-
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/pages/cenik.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/pages/cenik.scss
new file mode 100644
index 000000000..f45a55331
--- /dev/null
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/pages/cenik.scss
@@ -0,0 +1,70 @@
+.cenik-prikaz {
+  margin-top: -150px;
+
+  .ostale-storitve {
+    padding: 2rem 0;
+
+    .compare-row {
+
+      &.naslov {
+        text-transform: uppercase;
+
+        .cd {
+          font-weight: bold;
+        }
+      }
+
+      .compare-col {
+        &.leftcol {
+          min-width: 56%;
+        }
+
+        &.bold {
+          font-weight: bold;
+        }
+      }
+    }
+
+    .accordion-title-block {
+      width: 100%;
+
+      .accordion-title {
+        min-width: 60%;
+
+        &.w-70 {
+          min-width: 70%;
+        }
+
+        &.title-cena {
+          min-width: 20%;
+        }
+      }
+    }
+
+
+    &.w-70 {
+      .compare-col {
+        text-align: right;
+
+        &.leftcol {
+          text-align: left;
+        }
+      }
+
+      .accordion-title-block {
+        .accordion-title {
+          min-width: 70%;
+
+          &.title-cena {
+            min-width: 20%;
+            text-align: right;
+          }
+        }
+      }
+
+
+    }
+
+  }
+}
+
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/pages/iskanje.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/pages/iskanje.scss
new file mode 100644
index 000000000..aba8e24d1
--- /dev/null
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/pages/iskanje.scss
@@ -0,0 +1,5 @@
+.iskani-rezultat {
+  p {
+    color:#333;
+  }
+}
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/style.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/style.scss
index 75d060fa7..ce758032e 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/sass/style.scss
+++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/style.scss
@@ -3,6 +3,8 @@
 // SCSS glavna struktura
 @import "bacis/basic";
 @import "components/components";
+@import "pages/cenik";
+@import "pages/iskanje";
 
 @import "bolaric/components";
 @import "bolaric/1ka";
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig
deleted file mode 100644
index 940ac8333..000000000
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig
+++ /dev/null
@@ -1,158 +0,0 @@
-<div class="content">
-  <div class="topnav w-clearfix">
-    <div data-w-id="251a98d8-19f7-4f9a-bc79-92e7e9596d22" data-animation-type="lottie" data-src="documents/icons8-menu-11.json" data-loop="0" data-direction="1" data-autoplay="0" data-is-ix2-target="1" data-renderer="svg" data-default-duration="1.1666666666666667" data-duration="0" class="burger"></div>
-  </div>
-  <div class="">
-    <div class="container">
-      <div class="row pcenter">
-        <div class="vrsta">
-          <h1>Izbira pravega paketa glede na vrsto uporabnika</h1>
-          <p class="intro">Izbirate lahko tudi med <a href="#" class="textlink">poslovnimi paketi</a>, ki omogočajo “white label” rešitve, nadzor nad uporabniki v primeru večjega števila uporabnikov (društva, organizacije, podjetja). V primeru individualne uporabe (en uporabnik) priporočamo spodnje pakete. (<a href="#" class="textlink">Pogosta vprašanja</a>)</p>
-        </div>
-      </div>
-      <div class="row flex">
-        <div class="col">
-          <div data-duration-in="300" data-duration-out="100" class="tabs-pricing w-tabs">
-            <div class="tabs-menu-pricing w-tab-menu">
-              <a data-w-tab="Tab 1"  href="/d/sl/cenik/zasebni-paketi" class="tab w-inline-block w-tab-link">
-                <div>Posamezniki</div>
-              </a>
-              <a data-w-tab="Tab 2" href="/d/sl/cenik/poslovni-paketi" class="tab w-inline-block w-tab-link">
-                <div>Skupine</div>
-              </a>
-              <a data-w-tab="Tab 3" class="tab w-inline-block w-tab-link w--current">
-                <div>Ostale storitve</div>
-              </a>
-            </div>
-            <div class="tabs-content-copy w-tab-content">
-              <div data-w-tab="Tab 3" class="tab-pane-tab-1-2 w-tab-pane w--tab-active">
-                <div class="section paketi">
-{#                  {{ content }}#}
-                  {{ page.content  }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-
-
-{# OLD#}
-<!--<div class="section inner-content vsebina">
-  <div
-    class="container <?php print (!empty($content_class) ? $content_class : ''); ?>">
-
-
-    <div class="maincontent">
-      <div class="container">
-
-        &lt;!&ndash;            BREADCRUM &ndash;&gt;
-        <div class="col">
-          <?php if ($breadcrumb): ?>
-            <?php print $breadcrumb; ?>
-          <?php endif; ?>
-        </div>
-
-
-        <div class="col">
-
-          <div class='nakupovanje-meni'>
-            <div class='container'>
-              <ul class='nakupovanje-tabs'>
-                <li>
-                  <a
-                    href='<?php print ($language->language == 'sl' ? '/d/sl/cenik/zasebni-paketi' : '/d/en/price-list/private-packages'); ?>'
-                    class='nakupovanje-tabs-link'>
-                    <div class='ikona-tab'>
-                      <i class='fas fa-user'
-                         style='font-size: 2rem;'
-                         aria-hidden='true'>
-                      </i>
-                    </div>
-                    <?php print ($language->language == 'sl' ? 'Posamezniki' : 'Individuals'); ?>
-                  </a>
-                </li>
-                <li>
-                  <a
-                    href='<?php print ($language->language == 'sl' ? '/d/sl/cenik/poslovni-paketi' : '/d/en/price-list/business-packages'); ?>'
-                    class='nakupovanje-tabs-link'>
-                    <div class='ikona-tab'>
-                      <i class='fas fa-users'
-                         style='font-size: 2rem;'
-                         aria-hidden='true'>
-                      </i>
-                    </div>
-                    <?php print ($language->language == 'sl' ? 'Skupine' : 'Groups'); ?>
-                  </a>
-                </li>
-                <li class='active'>
-                  <a
-                    href='<?php print ($language->language == 'sl' ? '/d/sl/cenik/ostale-storitve' : '/d/en/pricelist/other-services'); ?>'
-                    class='nakupovanje-tabs-link'>
-                    <div class='ikona-tab'>
-                      <i class='far fa-window-restore'
-                         style='font-size: 2rem;'
-                         aria-hidden='true'>
-                      </i>
-                    </div>
-                    <?php print ($language->language == 'sl' ? 'Ostale storitve' : 'Other services'); ?>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-
-          <?php //print render($title_prefix); ?>
-          <?php //if ($title): ?>
-          &lt;!&ndash;  <h1>&ndash;&gt;<?php //print $title; ?>&lt;!&ndash;</h1>&ndash;&gt;
-          <?php //endif; ?>
-          <?php //print render($title_suffix); ?>
-          &lt;!&ndash;&ndash;&gt;
-          <?php //print $messages; ?>
-          &lt;!&ndash;&ndash;&gt;
-          &lt;!&ndash;&ndash;&gt;
-          <?php //print render($tabs); ?>
-          <?php //print render($page['help']); ?>
-          <?php //if ($action_links): ?>
-          &lt;!&ndash;  <ul class="action-links">&ndash;&gt;<?php //print render($action_links); ?>&lt;!&ndash;</ul>&ndash;&gt;
-          <?php //endif; ?>
-
-
-          <div class="section paketi">
-            <?php print render($page['content']); ?>
-          </div>
-
-          <?php print $feed_icons; ?>
-          &lt;!&ndash;                </main>&ndash;&gt;
-
-          &lt;!&ndash;			    &ndash;&gt;<?php ///*<div class="layout-swap__top layout-3col__full">
-          //
-          //            <?php /*<a href="#skip-link" class="visually-hidden visually-hidden&#45;&#45;focusable" id="main-menu" tabindex="-1">Back to top</a>
-          //
-          //            </div>*/ ?>
-
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <?php print render($page['footer']); ?>
-
-</div>
-
-<?php if ($page['bottom']): ?>
-  <div class="section greysection noga">
-    <div class="container">
-      <div class="section-2">
-        <div class="container-2"></div>
-      </div>
-
-      <?php print render($page['bottom']); ?>
-    </div>
-  </div>
-<?php endif; ?>-->
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig
new file mode 100755
index 000000000..7bc152aad
--- /dev/null
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--ostale-storitve.html.twig
@@ -0,0 +1,942 @@
+{#
+/**
+ * @file
+ * Returns the HTML for a single Drupal page.
+ *
+ * Complete documentation for this file is available online.
+ * @see https://drupal.org/node/1728148
+ */
+#}
+
+{# HEADER
+{% include '@pro1ka/parts/header.html.twig' %}
+END HEADER #}
+
+
+<div class="content cenik-prikaz">
+  <div class="topnav w-clearfix">
+    <div data-w-id="251a98d8-19f7-4f9a-bc79-92e7e9596d22" data-animation-type="lottie" data-src="documents/icons8-menu-11.json" data-loop="0" data-direction="1" data-autoplay="0" data-is-ix2-target="1" data-renderer="svg" data-default-duration="1.1666666666666667" data-duration="0" class="burger"></div>
+  </div>
+  <div class="">
+    <div class="container">
+      <div class="row pcenter">
+        <div class="vrsta">
+          <h1>Izbira pravega paketa glede na vrsto uporabnika</h1>
+          <p class="intro">Izbirate lahko tudi med <a href="#" class="textlink">poslovnimi paketi</a>, ki omogočajo “white label” rešitve, nadzor nad uporabniki v primeru večjega števila uporabnikov (društva, organizacije, podjetja). V primeru individualne uporabe (en uporabnik) priporočamo spodnje pakete. (<a href="#" class="textlink">Pogosta vprašanja</a>)</p>
+        </div>
+      </div>
+      <div class="row flex">
+        <div class="col">
+          <div data-duration-in="300" data-duration-out="100" class="tabs-pricing w-tabs">
+            <div class="tabs-menu-pricing w-tab-menu">
+              <a data-w-tab="Posamezniki" href="/d/sl/cenik/zasebni-paketi" class="tab w-inline-block w-tab-link">
+                <div>Posamezniki</div>
+              </a>
+              <a data-w-tab="Skupine" href="/d/sl/cenik/poslovni-paketi" class="tab w-inline-block w-tab-link">
+                <div>Skupine</div>
+              </a>
+              <a data-w-tab="Ostale storitve" class="tab w-inline-block w-tab-link w--current">
+                <div>Ostale storitve</div>
+              </a>
+            </div>
+            <div class="tabs-content-copy w-tab-content">
+              <div data-w-tab="Ostale storitve" class="tab-pane-tab-1-2 w-tab-pane w--tab-active">
+
+                {% if language.id == 'sl' %}
+                <p><strong>Metodološke storitve </strong>za specifične potrebe uporabnikov segajo od pomoči pri razvoju vprašalnika, vnosa podatkov, statističnih analiz, podpore pri izvedbi anketiranja in svetovanja oziroma izobraževanja za uporabo 1KA, pa do pisanja poročil, načrtovanja raziskav, najzahtevnejšega metodološkega svetovanja ter celovite izvedbe anketne raziskave.&nbsp;</p>
+
+                <p><strong>Tehnične storitve&nbsp;</strong>zajemajo standardizirane tehnične storitve, kot je restavriranje&nbsp;izbrisanega vprašalnika ali podatkov ter&nbsp;storitve po naročilu, kot je pomoč inženirja pri inštalaciji, dodatno programiranje ali sistemska pomoč.</p>
+
+                <p><strong>Izobraževanja </strong>so namenjena&nbsp;zaposlenim v zasebnem in javnem sektorju, ki se pri svojem delu soočajo z zbiranjem in obdelavo podatkov. Spodaj so opisi vseh izobraževanj. Po dogovoru je mogoče vsebino posameznega izobraževanja&nbsp;razširiti z dodatnimi vsebinami. Izobraževanje&nbsp;lahko naročite preko&nbsp; obrazca. Po oddanem povpraševanju vas bomo kontaktirali na vaš elektronski naslov, da se dogovorimo o podrobnostih izvedbe izbranega izobraževanja.</p>
+
+                <p>Vse navedeno ne sodi v osnovno storitev spletnega anketiranja 1KA, saj zahteva dodatno porabo časa s strani ekipe 1KA. Tovrstna pomoč se obračuna na osnovi porabljenih ur, kjer se upoštevajo neprofitne tarife. <strong>Obračunski interval so ure, pri čemer se upoštevajo&nbsp;ZAČETE&nbsp;ure.</strong> Urne postavke se razlikujejo glede na zahtevnost dela.</p>
+
+                <p>Pomembno:&nbsp;metodološke storitve 1KA se nanašajo predvsem na pripravo 1KA vprašalnika, napredno metodološko&nbsp;in projektno pomoč.&nbsp;<strong>Pomoči za diplomske, magistrske in doktorske naloge ne nudimo</strong>.&nbsp;V tem primeru predlagamo, da se&nbsp;obrnete na katerega izmed drugih ponudnikov.&nbsp;</p>
+
+                <p>Za dogovor o metodološkem svetovanju, tehnični pomoči ali izobraževanju (naročilo, ocena trajanja in stroškov) lahko kontaktirate preko<strong>&nbsp;<a href="https://www.1ka.si/help1KA" target="_blank">OBRAZCA &gt;&gt;</a>&nbsp;</strong>ali pokličete - pri tem upoštevajte, da navedena <strong>telefonska številka nikakor ni namenjena brezplačnemu svetovanju -</strong> na&nbsp;030/702-788.4</p>
+
+                <hr />
+                <p><strong>Pomembno:</strong></p>
+
+                <ol>
+                  <li>Nespremenjena, brezplačna in neomejena uporaba 1KA&nbsp;veljala za vse javne uporabnike z&nbsp;ArnesAAI dostopom&nbsp;(šolstvo, znanost ipd.), vendar na namestitvi&nbsp;1ka.arnes.si. Podrobnosti so&nbsp;<a href="https://www.1ka.si/d/sl/novice/2020/obvestilo-za-uporabnike-1ka-z-aai-prijavo-neomejena-uporaba-aplikacije-1ka-na-domeni" target="_self">tukaj</a>.</li>
+                  <li>Uporaba&nbsp;storitve&nbsp;spletnega anketiranja&nbsp;na&nbsp;<a href="https://www.1ka.si/d/sl/o-1ka/nacini-uporabe-storitve-1ka/1ka-na-www1kasi" target="_self">spletnem strežniku&nbsp;1KA</a>, Centra za družboslovno informatiko&nbsp;<a href="http://www.fdv.uni-lj.si/raziskovanje/raziskovalni-centri/oddelek-za-sociologijo/center-za-druzboslovno-informatiko" target="_blank">(CDI)</a>, UL FDV, na domeni&nbsp;<a href="https://www.1ka.si/">www.1ka.si</a>,&nbsp;kjer je matična namestitev aplikacije 1KA, je&nbsp;brezplačna&nbsp;in&nbsp;neomejena za osnovne funkcionalnosti.</li>
+                  <li>Brezplačno je celotno posredovanje datotek in navodil za namestitev <a href="https://www.1ka.si/d/sl/o-1ka/aplikacija-1ka">odprtokodne aplikacije 1KA</a> na lastnem strežniku uporabnika. Izkušnje kažejo, da uporabniki, ki imajo kompetentno tehnično podporo, namestitev izvedejo brez vseh težav in dodatnih vprašanj.</li>
+                  <li>Brezplačna je tudi pomoč uporabnikom v obsegu&nbsp;podajanja&nbsp;osnovnih&nbsp;pojasnil in usmeritev, kot izhajajo iz&nbsp;<a href="https://www.1ka.si/help1KA" target="_blank">obrazca Centra za pomoč</a>. Pri tem se&nbsp;pomoč omejuje izključno na odstranjevanje nesporazumov in usmerjanje uporabnikov na obstoječe videe, priročnike ter pogosta vprašanja.</li>
+                  <li>&nbsp;Brezplačno&nbsp;se obravnavajo&nbsp;vse tehnične težave ali napake pri delovanju&nbsp;storitve spletnega anketiranja&nbsp;1KA na domeni&nbsp;<a href="https://www.1ka.si/">www.1ka.si.</a></li>
+                </ol>
+
+                {% else %}
+                  <p><strong>Methodological services</strong> for specific user needs, they range from assistance in questionnaire development, data entry, statistical analysis, support in conducting surveys and consulting or training for the use of 1KA, to writing reports, research planning, the most demanding methodological advice and full implementation of survey research.</p>
+
+                  <p><strong>Technical services</strong> include standardized technical services, such as the restoration of a deleted questionnaire or data, and custom services, such as the assistance of an installation engineer, additional programming or system assistance.</p>
+
+                  <p>All of the above is not part of the basic 1KA online survey service, as it requires additional time on the part of the 1KA team. This type of assistance is calculated on the basis of hours spent, where non-profit tariffs are taken into account. <strong>The billing interval is hours, taking into account the STARTED hours.</strong> Hourly rates vary according to the complexity of the work.</p>
+
+                  <p>Important: 1KA methodological services relate mainly to the preparation of the 1KA questionnaire, advanced methodological and project assistance. <strong>We do not offer assistance for diploma, master's and doctoral theses</strong>. In this case, we suggest that you contact one of the other providers.</p>
+
+                  <p>To agree on methodological advice (order, estimate of duration and costs), you can contact us via <strong><a href="https://www.1ka.si/help1KA&amp;language=2" target="_blank">FORM&gt;&gt;</a></strong> or call - please note that <strong>the listed telephone number is in no way intended for free advice</strong> - on 030 / 702-788.</p>
+                {%  endif %}
+
+
+                <div class="ostale-storitve">
+                  <div class="compare-row naslov">
+                    <div class="compare-col leftcol">
+                      <div class="cd"><br></div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+                        {% if language.id == 'sl' %}
+                          Splošna postavka
+                        {%  else %}
+                          Hourly price
+                        {%  endif %}
+                      </div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+                        {% if language.id == 'sl' %}
+                          Na lokaciji naročnika
+                        {% else %}
+                          On user's location
+                        {% endif %}
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="ostale-storitve-tabela">
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              TEHNIČNA POMOČ PRI IZVEDBI 1KA VPRAŠALNIKA
+                            {% else %}
+                              TECHNICAL HELP WITH 1KA QUESTIONNAIRE
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">30 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                          <div class="accordion-title title-cena">45 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Vnos podatkov (npr. iz pisemskih vprašalnikov)
+                                {% else %}
+                                  Data entry (e.g. from literate questionnaires)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Priprava enostavnega vprašalnika (npr. prenos vprašanj iz MS Worda v 1KA)
+                                {% else %}
+                                  Preparation of a simple questionnaire (e.g. transfer questions from Word to 1KA)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Enostavno kodiranje kratkih odgovorov na osnovi izdelanih navodil
+                                {% else %}
+                                  Simple coding of short answers based on designed instructions
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Enostavni popravek vprašalnika (npr. vstavljanje pogojev, zank, slovarja …)
+                                {% else %}
+                                  Simple adjustment of the questionnaire (e.g. inserting conditions, loops dictionary)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Izvoz vprašalnika, podatkov, analiz, poročil v različne formate (npr. MS Word, SPSS, Excel)
+                                {% else %}
+                                  Export of questionnaire, data, analysis, reports in different formats (e.g. MS Word, SPSS, Excel)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              OSNOVNA METODOLOŠKA POMOČ PRI 1KA VPRAŠALNIKIH
+                            {% else %}
+                              BASIC METHODOLOGICAL HELP WITH 1KA SURVEYS
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">40 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                          <div class="accordion-title title-cena">60 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Osnovno testiranje vprašalnika
+                                {% else %}
+                                  Basic testing of the questionnaire
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Prilagoditev enostavnega vprašalnika
+                                {% else %}
+                                  Adjustment of a simple questionnaire
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Izdelava analiz v 1KA (v obliki tabel ali grafov)
+                                {% else %}
+                                  Analysis in 1KA (in form of tables or charts)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Osnovne statistične interpretacije
+                                {% else %}
+                                  Basic statistical interpretations
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Pomoč pri uporabi naprednih modulov
+                                {% else %}
+                                  Help using advanced modules
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Pomoč pri pošiljanje vabil (po pošti ali e-mail sistemu)
+                                {% else %}
+                                  Help sending invitations (by mail or e-mail system)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Postavitev zahtevnih vprašanj (socialna omrežja, kalkulacije, kvote)
+                                {% else %}
+                                  Setting up demanding questions (social networks, calculations, quotas)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              NAPREDNA METODOLOŠKA POMOČ
+                            {% else %}
+                              ADVANCED METHODOLOGICAL HELP
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">40 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                          <div class="accordion-title title-cena">60 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Metodološki pregled vprašalnika in svetovanje
+                                {% else %}
+                                  Methodological review of the questionnaire and counselling
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Razvoj enostavnega vprašalnika (glede na hipoteze ali podobne primere)
+                                {% else %}
+                                  Development of simple questionnaire (based on hypothesis or similar cases)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Splošna metodološka pomoč pri zahtevnejših anketah
+                                {% else %}
+                                  General methodological help with complex surveys
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Statistične analize v specializiranih orodjih (Excel, Stata, IBM-SPSS, R)
+                                {% else %}
+                                  Statistical analyses in specialised tools (Excel, Stata, IBM-SPSS, R)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Statistical interpretations of results
+                                {% else %}
+                                  Statistical interpretations of results
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              NAPREDNA POMOČ PRI IZVEDBI PROJEKTOV
+                            {% else %}
+                              ADVANCED HELP WITH LARGER PROJECTS
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">50 - 85 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                          <div class="accordion-title title-cena">75 - 125 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Zasnova in vodenje zahtevnega kodiranja
+                                {% else %}
+                                  The design and management of complex coding
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Razvoj zahtevnega vprašalnika (glede na hipoteze in literaturo)
+                                {% else %}
+                                  Comprehensive design and develpoment of complex questionnaires (according to the hypothesis and literature)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Celovita pomoč pri konceptualizaciji, analizi in vsebinski interpretaciji
+                                {% else %}
+                                  Comprehensive help with conceptualisation, analysis and contextual interpretation
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Projektno svetovanje pri večjih anketnih projektih
+                                {% else %}
+                                  Project consulting for major survey projects
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              TEHNIČNE STORITVE
+                            {% else %}
+                              TECHNICAL SERVICES
+                            {% endif %}
+                          </div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Enostavno restavriranje izbrisanega vprašalnika ali podatkov, če je uporabnik izbrisal po lastni napaki (izbris celotnega vprašalnika, izbris celotne ankete enega ali več respondentov)
+                                {% else %}
+                                  Easy restoration of a deleted questionnaire or data if the user deleted it by mistake (deletion of the entire questionnaire, deletion of the entire survey of one or more respondents)
+                                {% endif %}
+                              </div>
+                            </div>
+                            <div class="compare-col bold">30 €</div>
+                            <div class="compare-col">&nbsp;</div>
+                          </div>
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Napredno restavriranje izbrisanega vprašalnika ali podatkov na točno določeno časovno točko (restavriranje testnih podatkov, izbris posameznega vprašanja iz ankete ipd.) – 4 programerske ure
+                                {% else %}
+                                  Advanced restoration of a deleted questionnaire or data to a specific time point (restoration of test data, deletion of an individual question from the survey, etc.) - 4 programming hours
+                                {% endif %}
+                              </div>
+                            </div>
+                            <div class="compare-col bold">200 €</div>
+                            <div class="compare-col">&nbsp;</div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+
+                <div class="ostale-storitve w-70">
+                  <div class="compare-row naslov">
+                    <div class="compare-col leftcol">
+                      <div class="cd">
+                        {% if language.id == 'sl' %}
+                          LETNE VZDRŽEVALNE POGODBE
+                        {%  else %}
+                          ANNUAL MAINTAINANCE CONTRAC
+                        {%  endif %}
+                      </div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+                        {% if language.id == 'sl' %}
+                          Splošna postavka
+                        {%  else %}
+                          Hourly price
+                        {%  endif %}
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="ostale-storitve-tabela w-70">
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              STALNA METODOLOŠKA POMOČ
+                            {% else %}
+                              CONTINUOUS METHODOLOGICAL ASSISTANCE
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">750 € / {{ language.id == 'sl' ? 'leto' : 'year' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Brez vzdrževalne pogodbe nudi 1KA center za pomoč uporabnikom omejeno asistenco (usmerjanje uporabnikov na obstoječe vodiče in odpravljanje morebitnih tehničnih težav) izključno preko&nbsp;spletne forme, kjer je odzivni čas en delovni dan. Za takojšen odziv in stalno telefonsko pomoč s področja širšega metodološkega svetovanja je potrebna vzdrževalna pogodba, ki vključuje naslednje (v primeru zahtevnejših projektov so mogoči še nadaljnji dogovor):</p>
+
+                                  <ul>
+                                    <li>na voljo je stalna telefonska pomoč v delovnem času (8h - 16h),</li>
+                                    <li>na voljo je pomoč po emailu, kjer je v delovnem času odziv v 2 urah,</li>
+                                    <li>specifične potrebe uporabnika po novih funkcionalnostih 1KA se v primeru vzdrževalne pogodbe pomaknejo na vrh razvoja novih funkcionalnosti.</li>
+                                  </ul>
+                                {% else %}
+                                  Without maintenance contract 1KA help desk offers only limited assistance (directing users to the existing manuals and solving technical issues) exclusively through the&nbsp;online form, where the response time is one business day. For an immediate response and continuous telephone assistance in the context of methodological counselling a maintenance contract is needed, which includes the following (in case of complex projects additional arrangements are possible):</p>
+
+                                  <ul>
+                                    <li>continuous telephone support during business hours (8am - 16pm);</li>
+                                    <li>available assistance via email; during working hours the response time is up to 2 hours;</li>
+                                    <li>specific needs of the user according to the new 1KA functionalities are in case of a maintenance contract moved to the top of the development of new functionality.</li>
+                                  </ul>
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              STALNA TEHNIČNA PODPORA V PRIMERU LASTNE INŠTALACIJE ALI VIRTUALNE DOMENE NA 1KA STREŽNIKU
+                            {% else %}
+                              CONTINUOUS TECHNICAL SUPPORT IN THE EVENT OF OWN INSTALLATION ON 1KA SERVER
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">750 € / {{ language.id == 'sl' ? 'leto' : 'year' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  <p>Stalna tehnična podpora v primeru lastne&nbsp;inštalacije&nbsp;aplikacije 1KA na strežniku 1KA. Vključuje:</p>
+
+                                  <ul>
+                                    <li>Tehnična podpora na osnovi vzdrževalne pogodbe vsebuje stalno tehnično podporo, tako telefonsko (v delovnem času 8h - 16h) kot po emailu (odzivni čas 2 uri v delovnem času).</li>
+                                    <li>Uvrstitev specifičnih tehničnih potreb uporabnika na vrh razvoja aplikacije 1KA.</li>
+                                    <li>Možnost podrobnega restavriranja iz varnostnih kopij (na dan) - v pogodbo je vključeno 1 restavriranje (vsako naslednje restavriranje je dodatno plačljivo po objavljenem ceniku)-</li>
+                                    <li>Nameščanje ene nadgradnje (vsaka dodatna nadgradnja na zahtevo naročnika je plačljiva po objavljenem ceniku).</li>
+                                    <li>Strojna zmogljivost za izvajanje anket do 100.000 enot in strojna podpora tudi za najbolj zahtevne analize.</li>
+                                    <li>Odzivni čas manj kot en delovni dan, takojšnje intervencije v primeru tehničnih težav.</li>
+                                  </ul>
+
+                                {% else %}
+                                  <p>Continuous technical support&nbsp;is relating to the user's own installation of 1KA application and&nbsp;includes:</p>
+
+                                  <ul>
+                                    <li>Technical support on the basis of a maintenance contract contains a permanent technical support by phone (during business hours 8 am - 16 pm) and by email (response time of 2 hours during working hours);</li>
+                                    <li>Ranking user's specific technical needs as a top priority in the development of 1KA application;</li>
+                                    <li>Possibility of detailed restoration from backups (per day) - 1 restoration is included in the contract (each subsequent restoration is additionally paid according to the published price list) -</li>
+                                    <li>Installation of one upgrade (each additional upgrade at the request of the client is payable according to the published price list).</li>
+                                    <li>Hardware capacity for conducting surveys of up to 100,000 units and hardware support for even the most demanding analyzes.</li>
+                                    <li>Response time less than one working day, immediate interventions in case of technical problems.</li>
+                                  </ul>
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              STALNA TEHNIČNA PODPORA V PRIMERU LASTNE INŠTALACIJE NA STREŽNIKU UPORABNIKA
+                            {% else %}
+                              CONTINUOUS TECHNICAL SUPPORT IN THE EVENT OF OWN INSTALLATION ON THE USER'S SERVER
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">750 € / {{ language.id == 'sl' ? 'leto' : 'year' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  <p>Stalna tehnična podpora v primeru lastne&nbsp;inštalacije&nbsp;aplikacije 1KA na strežniku uporabnika. Pogoj za vzpostavitev pogodbe je, da&nbsp;naročnik zagotovi oddaljen dostop do strežnika našemu sistemskem inženirju oz. programerju. Pogodba&nbsp;vključuje:</p>
+
+                                  <ul>
+                                    <li>Razpoložljivost celotnega tehničnega osebja (sistemski inženir, 1KA programerji).</li>
+                                    <li>Pomoč pri vzpostavitvi, intervencije v primeru tehničnih težav.</li>
+                                    <li>Nameščanje ene nadgradnje (vsaka dodatna nadgradnja na zahtevo naročnika je plačljiva po objavljenem ceniku).</li>
+                                    <li>V primeru, da naše tehnično osebje nima dostopa do strežnika, je potrebno vsako težavo urejati na lokaciji naročnika, kar pomeni dodatne stroške pri vsaki intervenciji.&nbsp;&nbsp;</li>
+                                  </ul>
+                                {% else %}
+                                  <p>The condition for establishing a contract is that the client provides remote access to the server to our system engineer or. programmer. The contract includes:</p>
+
+                                  <ul>
+                                    <li>Availability of all technical staff (system engineer, 1KA programmers).</li>
+                                    <li>Assistance in setting up, interventions in case of technical problems.</li>
+                                    <li>Installation of one upgrade (each additional upgrade at the request of the client is payable according to the published price list).</li>
+                                    <li>In the event that our technical staff does not have access to the server, it is necessary to manage any problems at the client's location, which means additional costs for each intervention.</li>
+                                  </ul>
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="ostale-storitve">
+                  <div class="compare-row naslov">
+                    <div class="compare-col leftcol">
+                      <div class="cd"><br></div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+                        {% if language.id == 'sl' %}
+                          Splošna postavka
+                        {%  else %}
+                          Hourly price
+                        {%  endif %}
+                      </div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+                        {% if language.id == 'sl' %}
+                          Na lokaciji naročnika
+                        {% else %}
+                          On user's location
+                        {% endif %}
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="ostale-storitve-tabela">
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              STANDARDIZIRANE URNE POSTAVKE
+                            {% else %}
+                              STANDARDISED HOURLY PRICES
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">50 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                          <div class="accordion-title title-cena">75 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Inženirska ura (pomoč pri inštalaciji preko emaila ali telefona, sistemska pomoč, dodatno programiranje) na naši lokaciji znaša za vsako začeto uro 50 € (v primeru lastnih namestitev tudi za vsako začeto email korespondenco in za vsako začeto telefonsko ali osebno konzultacijo).
+                                {% else %}
+
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                  </div>
+                </div>
+
+
+                <div class="ostale-storitve">
+                  <div class="compare-row naslov">
+                    <div class="compare-col leftcol">
+                      <div class="cd">
+                        {% if language.id == 'sl' %}
+                          IZOBRAŽEVANJA
+                        {%  else %}
+
+                        {%  endif %}
+                      </div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+                        {% if language.id == 'sl' %}
+                          Splošna postavka
+                        {%  else %}
+                          Hourly price
+                        {%  endif %}
+                      </div>
+                    </div>
+                    <div class="compare-col">
+                      <div>
+
+                      </div>
+                    </div>
+                  </div>
+
+                  <div class="ostale-storitve-tabela">
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              DELAVNICE
+                            {% else %}
+                              WORKSHOPS
+                            {% endif %}
+                          </div>
+                          <div class="accordion-title title-cena">100 € / {{ language.id == 'sl' ? 'uro' : 'hour' }}</div>
+                          <div class="accordion-title title-cena"></div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  Izvedba delavnic poteka po dogovoru z naročnikom (lokacija, vsebina, trajanje)
+                                {% else %}
+                                  The workshop is held in agreement with the client (location, content, duration)
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              UČINKOVITA UPORABA ORODJA ZA SPLETNO ANKETIRANJE 1KA
+                            {% else %}
+
+                            {% endif %}
+                          </div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  <p>Orodje 1KA omogoča zelo veliko možnosti za izdelavo vprašalnikov in zbiranje podatkov, vendar pa so za izkoriščenje celotnega potenciala orodja potrebna določena metodološka in tehnična znanja. Na interaktivni delavnici se bo udeleženec seznanil s uporabo vseh funkcij 1KA, ki so potrebne za pripravo in izvedbo spletne ankete, od oblikovanja vprašalnika, nastavitev in testiranja, do objave, zbiranja in analiziranja podatkov. Celotna vsebina bo vezana na učinkovito uporabo orodja za spletno anketiranje 1KA. Udeležbo priporočamo vsem, ki se pri svojem delu soočate z zbiranjem podatkov in bi se radi seznanili z orodjem 1KA ter s priporočili za kakovostnejšo izvedbo spletne ankete. Po dogovoru je mogoče delavnico razširiti z dodatnimi vsebinami (npr. pošiljanje email vabil).</p>
+
+                                  <ul>
+                                    <li><strong>Ciljne skupine: </strong>Osebe, ki se pri svojem delu soočajo z zbiranjem podatkov;</li>
+                                    <li><strong>Vsebina:</strong>
+                                      <ul>
+                                        <li>Oblikovanje vprašalnika: postavljanje vprašanj, uporaba pogojev;</li>
+                                        <li>Nastavitve vprašalnika: trajanje, jezik, obveščanje;</li>
+                                        <li>Testiranje vprašalnika: avtomatski testni vnosi;</li>
+                                        <li>Objava: objava vprašalnika prek socialnih omrežjih;</li>
+                                        <li>Zbiranje podatkov: pregled in izvoz podatkov;</li>
+                                        <li>Analiziranje: osnovne statistike, prikaz grafičnih rezultatov.</li>
+                                      </ul>
+                                    </li>
+                                    <li><strong>Lokacija: </strong>preko spleta (ZOOM, MS Teams)</li>
+                                  </ul>
+                                {% else %}
+                                  ...
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              VIZUALIZACIJA PODATKOV
+                            {% else %}
+
+                            {% endif %}
+                          </div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  <p>Izvedba spletnih anket je tehnično enostavna, vendar je kakovost podatkov v veliki meri odvisna od ustrezne priprave celotne anketne raziskave. Delavnica skozi predavanja in praktične prikaze izpostavlja ključna načela metodologije spletnega anketiranja. Osredotoča se na vse korake priprave in izvedbe spletnih anket, s poudarkom na dejavnikih, ki lahko pozitivno ali negativno vplivajo na kakovost podatkov. Posebna pozornost je namenjena ustrezni pripravi spletnih vprašalnikov in pristopom za spodbujanje sodelovanja v anketah. Delavnica tako ponuja temeljna metodološka znanja za samostojno pripravo kakovostnih spletnih anket. Vsebine je po dogovoru mogoče prilagoditi predznanju in potrebam udeležencev.</p>
+
+                                  <ul>
+                                    <li><strong>Ciljne skupine:</strong> Delavnica je namenjena vsem, ki želijo zbirati podatke z uporabo spletnih anket in pri tem zagotavljati visoko kakovost podatkov;</li>
+                                    <li><strong>Vsebina:</strong>
+                                      <ul>
+                                        <li>Odločanje o primernosti uporabe spletne ankete;</li>
+                                        <li>Razlike md verjetnostnimi in neverjetnostnimi vzorci;</li>
+                                        <li>Osnovna načela ubeseditve anketnih vprašanj za spletne vprašalnike;</li>
+                                        <li>Priprava spletnega vprašalnika: izbor ustreznih tipov vprašanj, samodejno preverjanje ustreznosti odgovorov;</li>
+                                        <li>Vabljenje anketirancev k sodelovanju;</li>
+                                        <li>Priprava podatkov za analizo.</li>
+                                      </ul>
+                                    </li>
+                                    <li><strong>Lokacija: </strong>preko spleta (ZOOM, MS Teams)</li>
+                                  </ul>
+
+                                {% else %}
+                                  ...
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="accordion">
+                      <div class="accordion-head first" data-open="1">
+                        <div class="accordion-title-block">
+                          <img src="/tema1ka/svg/nakup-kreiranje-vprsalnika.svg" class="accordion-icon">
+                          <div class="accordion-title">
+                            {% if language.id == 'sl' %}
+                              DODATNE INFORMACIJE
+                            {% else %}
+                              OTHER INFORMATION
+                            {% endif %}
+                          </div>
+                        </div>
+                      </div>
+                      <div class="accordion-toggle data-1">
+                        <div class="compare-wrap">
+
+                          <div class="compare-row">
+                            <div class="compare-col leftcol">
+                              <div class="cd">
+                                {% if language.id == 'sl' %}
+                                  <p>Izvedba delavnice poteka po dogovoru z naročnikom (lokacija, vsebina, trajanje). Cena za izvedbo delavnice za 15 udeležencev je 100 € / uro.&nbsp;Izvede se lahko delavnica tudi za 30 udeležencev, v tem primeru je cena 200 € / uro.<br />
+                                    Vse cene so v EUR in brez DDV; če se storitev izvede na fizični lokaciji uporabnika, se tarife zvišajo za 50 %.</p>
+
+                                  <p>Kontakt:</p>
+
+                                  <ul>
+                                    <li><a href="http://www.1ka.si/help1KA">Obrazec za naročilo delavnice&nbsp;</a></li>
+                                  </ul>
+                                {% else %}
+                                  ...
+                                {% endif %}
+                              </div>
+                            </div>
+                          </div>
+
+
+                        </div>
+                      </div>
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+  {#   NOGA
+  {% include '@pro1ka/parts/footer.html.twig' %}
+  {#   END NOGA #}
+
+</div>
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig
index b0dab58fb..23924b656 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig
@@ -13,7 +13,7 @@
  END HEADER #}
 
 
-<div class="content">
+<div class="content cenik-prikaz">
   <div class="topnav w-clearfix">
     <div data-w-id="251a98d8-19f7-4f9a-bc79-92e7e9596d22" data-animation-type="lottie" data-src="documents/icons8-menu-11.json" data-loop="0" data-direction="1" data-autoplay="0" data-is-ix2-target="1" data-renderer="svg" data-default-duration="1.1666666666666667" data-duration="0" class="burger"></div>
   </div>
@@ -29,13 +29,13 @@
         <div class="col">
           <div data-duration-in="300" data-duration-out="100" class="tabs-pricing w-tabs">
             <div class="tabs-menu-pricing w-tab-menu">
-              <a data-w-tab="Tab 1" href="/d/sl/cenik/zasebni-paketi" class="tab w-inline-block w-tab-link">
+              <a data-w-tab="Posamezniki" href="/d/sl/cenik/zasebni-paketi" class="tab w-inline-block w-tab-link">
                 <div>Posamezniki</div>
               </a>
-              <a data-w-tab="Tab 2" class="tab w-inline-block w-tab-link w--current">
+              <a data-w-tab="Skupine" class="tab w-inline-block w-tab-link w--current">
                 <div>Skupine</div>
               </a>
-              <a data-w-tab="Tab 3"  href="/d/sl/cenik/ostale-storitve" class="tab w-inline-block w-tab-link">
+              <a data-w-tab="Ostale storitve"  href="/d/sl/cenik/ostale-storitve" class="tab w-inline-block w-tab-link">
                 <div>Ostale storitve</div>
               </a>
             </div>
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig
index 326858a45..60026a06b 100755
--- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig
@@ -13,7 +13,7 @@
 END HEADER #}
 
 
-<div class="content">
+<div class="content cenik-prikaz">
   <div class="topnav w-clearfix">
     <div data-w-id="251a98d8-19f7-4f9a-bc79-92e7e9596d22" data-animation-type="lottie" data-src="documents/icons8-menu-11.json" data-loop="0" data-direction="1" data-autoplay="0" data-is-ix2-target="1" data-renderer="svg" data-default-duration="1.1666666666666667" data-duration="0" class="burger"></div>
   </div>
@@ -29,13 +29,13 @@ END HEADER #}
         <div class="col">
           <div data-duration-in="300" data-duration-out="100" class="tabs-pricing w-tabs">
             <div class="tabs-menu-pricing w-tab-menu">
-              <a data-w-tab="Tab 1" class="tab w-inline-block w-tab-link w--current">
+              <a data-w-tab="Posamezniki" class="tab w-inline-block w-tab-link w--current">
                 <div>Posamezniki</div>
               </a>
-              <a data-w-tab="Tab 2" href="/d/sl/cenik/poslovni-paketi" class="tab w-inline-block w-tab-link">
+              <a data-w-tab="Skupine" href="/d/sl/cenik/poslovni-paketi" class="tab w-inline-block w-tab-link">
                 <div>Skupine</div>
               </a>
-              <a data-w-tab="Tab 3"  href="/d/sl/cenik/ostale-storitve" class="tab w-inline-block w-tab-link">
+              <a data-w-tab="Ostale storitve"  href="/d/sl/cenik/ostale-storitve" class="tab w-inline-block w-tab-link">
                 <div>Ostale storitve</div>
               </a>
             </div>
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/search-api-page-result.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/search-api-page-result.html.twig
new file mode 100644
index 000000000..504672b95
--- /dev/null
+++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/search-api-page-result.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file
+ * Default theme implementation for displaying a single search result coming from Search API page.
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="iskani-rezultat">
+  <a href="{{ url }}">
+{{ title_prefix }}
+<h3{{ title_attributes }}>
+  {{ title }}
+</h3>
+{{ title_suffix }}
+{% if snippet %}
+  <p{{ content_attributes }}>{{ snippet }}</p>
+{% endif %}
+  </a>
+</div>
diff --git a/lang/1.php b/lang/1.php
index fb7e62409..3ac1ec053 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -726,7 +726,8 @@ $lang = array (
 	"n_list"			=>	"Spisek prejemnikov",
 	"n_desc_list"			=>	"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>Zahtevali ste spisek prejemnikov. Preverite ga, ter potrdite<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;oziroma popravite prejemnike.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>Spisek prejemnikov</b></i><br><br>",
 	"n_list_users"			=>	"Uporabniki",
-	"n_users_list"          =>  "Pregled",
+	"n_users_list"          =>  "Moji uporabniki",
+	"n_users_list_add"          =>  "Dodajanje uporabnikov",
 	"n_users_list_all"      =>  "Vsi",
 	"n_deleted_users"       =>  "Izbrisani",
 	"n_unsigned_users"      => "Odjavljeni",
@@ -4255,6 +4256,8 @@ $lang = array (
 	"srv_survey_archives_ie_data"		=>	"Vprašalnik in podatki",
 	"srv_survey_archives_ie_data_title"		=>	"Izvoz vprašalnika in podatkov",
 	"srv_survey_archives_tracking"		=>	"Spremembe",
+	"srv_survey_archives_tracking_history"		=>	"Zgodovina sprememb",
+	"srv_survey_archives_tracking_archive"		=>	"Arhiv sprememb",
 	"srv_survey_archives_tracking_survey"	=>	"Spremembe vprašalnika",
 	"srv_survey_archives_tracking_survey_text1"	=>	"V spodnji tabeli je navedenih zadnjih 25 sprememb",
 	"srv_survey_archives_tracking_survey_text_appendmerge"	=>	"povezanih z dodajanjem ali združevanjem podatkov",
@@ -4610,9 +4613,9 @@ $lang = array (
 	"srv_export_questionnare_2"					=>	"Pozor: pri večjih anketah zaradi obsežnosti tovrsten izpis morda ni smiselen! Za več kot 300 izpisov morate zato imeti status administratorja.",
 	//"srv_export_pagebreak"						=>	"Vsak respondent na novi strani",
 	"srv_export_pagebreak"						=>	"Vsak respondent na novi strani (le za PDF)",
-	"srv_export_if"								=>	"Prikaz if-ov",
+	"srv_export_if"								=>	"Prikaz pogojev (IF)",
 	"srv_export_font"							=>	"Velikost pisave (le za PDF)",
-	"srv_export_show_recnum"					=>	"Prikaz recnuma",
+	"srv_export_show_recnum"					=>	"Prikaz recnuma oz. zaporedne številke respondenta",
 	"srv_export_results_settings"				=>	"Izpis odgovorov respondentov",
 	"srv_export_survey_settings"				=>	"Izpis vprašalnika",
 	"srv_export_intro"							=>	"Prikaz uvoda",
@@ -6629,7 +6632,10 @@ $lang = array (
 	'srv_users_viewing2'						=>	'Trenutno aktivni uredniki',
 	'srv_users_viewing3'						=>	'Število aktivnih urednikov',
 	'srv_users_add_new'							=>  'Nov uporabnik',
-	"srv_users_add_new_title"					=>	'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem.</span>',
+	'srv_users_add_new_type'							=>  'Način dodajanja uporabnika:',
+	'srv_users_add_new_type1'							=>  'Ustvarite novega uporabnika v sistemu <span class="gray">(Uporabnik bo obveščen na e-mail, da je bil registriran v sistem, in da je pod vašim pregledom)</span>',
+	'srv_users_add_new_type2'							=>  'Aktivirajte pregled nad obstoječim uporabnikom <span class="gray">(Uporabnik bo obveščen na e-mail, da je pod vašim pregledom)</span>',
+	"srv_users_add_new_title"					=>	'Ustvarite novega uporabnika v sistemu <br><span style="color: gray; font-size:80%; font-weight:normal">Uporabnik bo obveščen na e-mail, da je bil registriran v sistem in, da je pod vašim pregledom.</span>',
 	'srv_users_add_assigned'					=>  'Dodajte pregled nad uporabniki',
 	'srv_users_add_assigned_current'			=>  'Trenutno dodeljenih dostopov:',
 	'srv_users_add_assigned_max_reached'		=>  'Dosegli ste maksimalno število uporabnikov v pregledu.',
diff --git a/lang/2.php b/lang/2.php
index 4879075ea..4047e3053 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -715,7 +715,8 @@ $lang = array (
 	"n_n_users"		=>	"Notify users",
 	"n_desc_list"		=>	"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i>You requested listing of recipients. Check it<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;and confirm or change the receivers.<br><br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>List of email recipients</b></i><br><br>",
 	"n_list_users"		=>	"Users",
-	"n_users_list"          =>  "Overview",
+	"n_users_list"          =>  "My users",
+	"n_users_list_add"          =>  "Add users",
 	"n_users_list_all"      =>  "All users",
 	"n_deleted_users"       =>  "Deleted users",
 	"n_unsigned_users"      => "Unsigned users",
@@ -4235,6 +4236,8 @@ $lang = array (
 	"srv_survey_archives_ie_data"		=>	"Survey and data",
 	"srv_survey_archives_ie_data_title"		=>	"Survey and data import / export",
 	"srv_survey_archives_tracking"		=>	"Changes",
+	"srv_survey_archives_tracking_history"		=>	"Change history",
+	"srv_survey_archives_tracking_archive"		=>	"Change archive",
 	"srv_survey_archives_tracking_survey"	=>	"Survey changes",
 	"srv_survey_archives_tracking_survey_text1"	=>	"The table below shows the last 25 changes",
 	"srv_survey_archives_tracking_survey_text_appendmerge"	=>	"related to adding or merging data",
@@ -4586,9 +4589,9 @@ $lang = array (
 	"srv_export_questionnare_2"					=>	"Warning: Export for survey with more than 300 respondents is possible only for administrators!",
 	//"srv_export_pagebreak"						=>	"Every respondent starts with a new page",
 	"srv_export_pagebreak"						=>	"Every respondent starts with a new page (PDF only)",
-	"srv_export_if"								=>	"Show if clauses",
+	"srv_export_if"								=>	"Show conditions (IF)",
 	"srv_export_font"							=>	"Font size (PDF only)",
-	"srv_export_show_recnum"					=>	"Show recnum",
+	"srv_export_show_recnum"					=>	"Show recnum (respondent's consecutive number)",
 	"srv_export_results_settings"				=>	"Answers export",
 	"srv_export_survey_settings"				=>	"Survey export",
 	"srv_export_intro"							=>	"Show intro",
@@ -6517,6 +6520,9 @@ $lang = array (
 	'srv_users_viewing2'						=>	'Currently active editors',
 	'srv_users_viewing3'						=>	'Currently active editors',
     'srv_users_add_new'							=>  'Add new user',
+	'srv_users_add_new_type'							=>  'Add user mode:',
+	'srv_users_add_new_type1'							=>  'Create a new user in the system <span class="gray">(The user will be notified via e-mail that they have been registered under your overview)</span>',
+	'srv_users_add_new_type2'							=>  'Activate an overview of an existing user <span class="gray">(The user will be notified via e-mail that they are under your overview)</span>',
     "srv_users_add_new_title"					=>	'Create new user in the system<br><span style="color: gray; font-size:80%; font-weight:normal">User will be notified about this registration with an e-mail.</span>',
     'srv_users_add_assigned'					=>  'Add assigned users',
     'srv_users_add_assigned_current'			=>  'Number of assigned users:',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 26b254336..e41b69368 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10016,7 +10016,7 @@ textarea:focus {
 }
 .box-container .num_box {
   border: 1px solid #E5E5E5;
-  background-color: white;
+  background-color: #FFFF;
   border-radius: 2px;
   cursor: pointer;
   margin: 0px;
@@ -10478,9 +10478,9 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
 div.button_holder.editor_button_holder {
   margin: 0;
   padding: 8px 16px;
-  border-bottom: 1px rgb(204, 204, 204) solid;
-  border-left: 1px rgb(204, 204, 204) solid;
-  border-right: 1px rgb(204, 204, 204) solid;
+  border-bottom: 1px #cccccc solid;
+  border-left: 1px #cccccc solid;
+  border-right: 1px #cccccc solid;
   border-radius: 0 0 2px 2px;
 }
 
@@ -20939,10 +20939,10 @@ div.page_tema div.theme_list div.options div.buttons-window {
   position: absolute;
   bottom: 20px;
   max-width: 113px;
-  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
+  box-shadow: 0px 0px 7px 0px #0000001F;
   border-radius: 2px;
   margin-right: 5px;
-  background-color: white;
+  background-color: #FFFF;
 }
 div.page_tema div.theme_list div.options div.buttons-window .button {
   border: none;
@@ -21243,7 +21243,7 @@ div#theme-edit-wrap div#theme-editor #picker {
   left: 500px;
   z-index: 999;
   border-radius: 2px;
-  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
+  box-shadow: 0px 0px 7px 0px #0000001F;
 }
 div#theme-edit-wrap div#theme-editor #picker .popup_close {
   position: absolute !important;
@@ -24991,6 +24991,15 @@ div#srv_diagnostic .button_holder button {
   margin: 0 0 0 8px;
 }
 
+div.page_komentarji #additional_navigation,
+div.page_komentarji_anketa #additional_navigation {
+  display: flex;
+  justify-content: center;
+}
+div.page_komentarji #additional_navigation #menu,
+div.page_komentarji_anketa #additional_navigation #menu {
+  width: fit-content;
+}
 div.page_komentarji div#comment_question_note,
 div.page_komentarji_anketa div#comment_question_note {
   margin-bottom: 16px;
@@ -25918,6 +25927,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;
   }
@@ -30073,7 +30083,7 @@ iframe#ifmcontentstoprint {
 .analysis_icons_holder {
   background-color: white;
   border-radius: 2px;
-  box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
+  box-shadow: 0px 0px 7px 0px #0000001F;
 }
 .analysis_icons_holder .icon_box {
   margin-left: 16px;
@@ -30362,15 +30372,15 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
 }
 
 .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 {
@@ -33858,19 +33868,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;
   }
@@ -33964,6 +33979,7 @@ body #main_holder #main .wide {
     width: 100%;
     margin: 0;
   }
+
   fieldset {
     width: 100% !important;
     box-sizing: border-box !important;
@@ -33993,36 +34009,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*/
@@ -34278,6 +34302,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;
@@ -34299,6 +34324,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     padding: 0;
     border: 0;
   }
+
   /* Popup za vprasajcke */
   .qtip {
     position: fixed !important;
@@ -34309,6 +34335,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;
@@ -34319,10 +34346,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;
   }
@@ -34397,6 +34426,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;
@@ -34480,6 +34510,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;
   }
@@ -34492,16 +34523,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;
@@ -34606,9 +34640,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;
@@ -34628,6 +34664,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;
@@ -34681,6 +34718,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;
@@ -34733,6 +34771,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;
@@ -34745,6 +34784,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 {
@@ -34760,15 +34800,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;
@@ -34786,6 +34829,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;
   }
@@ -34812,6 +34856,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;
   }
@@ -34819,6 +34864,7 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
     flex-wrap: wrap;
   }
+
   #srv_diagnostic br {
     display: none;
   }
@@ -34839,6 +34885,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;
   }
@@ -34852,6 +34899,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;
   }
@@ -34859,6 +34907,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;
@@ -34883,6 +34932,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;
@@ -34950,6 +35000,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,
@@ -35033,6 +35084,7 @@ table.invitations_settings p label input[type=password],
     width: 100% !important;
     box-sizing: border-box;
   }
+
   #surveyInvitationSetting,
 #surveyInvitationSettingServer {
     min-width: 100% !important;
@@ -35040,6 +35092,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;
@@ -35078,6 +35131,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,
@@ -35098,6 +35152,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;
@@ -35109,6 +35164,7 @@ table.invitations_settings p label input[type=password],
     width: 100%;
     box-sizing: border-box;
   }
+
   .addthis_toolbox {
     line-height: 24px;
   }
@@ -35123,9 +35179,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%;
@@ -35137,6 +35195,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;
@@ -35207,9 +35266,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,
@@ -35250,6 +35311,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;
   }
@@ -35269,6 +35331,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;
   }
@@ -35278,13 +35341,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;
@@ -35307,6 +35373,7 @@ table.invitations_settings p label input[type=password],
     display: block;
     clear: both;
   }
+
   table.analysis_reports {
     border-spacing: 0px;
   }
@@ -35323,12 +35390,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;
   }
@@ -35350,11 +35419,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;
@@ -35365,6 +35436,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/settings/uporabniki.scss b/resources/sass/admin_new/pages/settings/uporabniki.scss
index 8bb4bc076..0571dfde9 100644
--- a/resources/sass/admin_new/pages/settings/uporabniki.scss
+++ b/resources/sass/admin_new/pages/settings/uporabniki.scss
@@ -78,12 +78,14 @@ div.subpage_uporabniki {
         }
     }
 
-    //Pregled in dodajanje
+    //Moji uporabniki
 
     div.users_list_box {
         padding: 0 12px;
     }
 
+    // Dodajanje
+
     div.add_user {
         margin-bottom: 32px;
         
diff --git a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
index 418570e53..74e9aa1b8 100644
--- a/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
+++ b/resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
@@ -1,6 +1,16 @@
 div.page_komentarji,
 div.page_komentarji_anketa {
 
+    //Meni zgoraj
+    #additional_navigation {
+        display: flex;
+        justify-content: center;
+
+        #menu {
+            width: fit-content;
+        }
+    }
+
     //Splošni komentarji
 
     div#comment_question_note {