diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 57ca7034d..3996dd255 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -7386,8 +7386,9 @@ class Branching {
         }
         // Pogoj pri npr. obvescanju
         elseif($vrednost == -3){
-            echo '<h2>'.$lang['urejanje_pogoj_popup'].'</h2>';
+            echo '<span class="IF_title_start">IF</span><span class="IF_title">'.$lang['urejanje_pogoj_popup'].'</span>';
             echo '<div class="popup_close"><a href="#" onClick="alert_if_close(\''.$vrednost.'\', \''.$if.'\'); return false;">✕</a></div>';
+			echo '<span class="IF_title_line"></span>';
         }
         // Validacija
         elseif($vrednost == -4){
diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 3b97b76a5..5bf35d840 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -2201,6 +2201,7 @@ class SurveyAdmin
 
     // Prikazemo levi meni po potrebi
     private function displayLeftMenu(){
+        global $lang;
 
         $hierarhija_type = (!empty($_SESSION['hierarhija'][$this->anketa]['type']) ? $_SESSION['hierarhija'][$this->anketa]['type'] : null);
 
@@ -2298,14 +2299,14 @@ class SurveyAdmin
         // Arhiv levi meni
         elseif(in_array($_GET['a'], ['arhivi', 'tracking', 'tracking-hierarhija']) || in_array($_GET['m'], ['anal_arch', 'view_archive'])){
 
-            echo '<div class="anketa_edit_left">';
+            echo '<span class="menu_left-title">'.$lang['srv_arhivi'].'</span>';
+
 
             echo '<div id="globalSetingsLinks" class="globalSetingsLinks archive">';
             $SSH = new SurveyStaticHtml($this->anketa);
             $SSH->displayArchiveNavigation();
             echo '</div>';
 
-            echo '</div>';
         }
 
     }
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index aed4bbcc3..8b51c045f 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1539,7 +1539,7 @@ class SurveyAdminSettings {
 			echo '<fieldset class="wide"><legend>'.$lang['srv_extra_translations'].' ';
 			
 			if ($row['multilang'] == 1) {
-				echo ' <select name="lang_id" onchange="window.location.href=\'index.php?anketa='.$this->anketa.'&a=jezik&lang_id=\'+this.value;">';
+				echo ' <select class="dropdown large w130 inline" name="lang_id" onchange="window.location.href=\'index.php?anketa='.$this->anketa.'&a=jezik&lang_id=\'+this.value;">';
 				
 				$lang_id = (int)$_GET['lang_id'];
 				if ($lang_id > 0)
@@ -1563,33 +1563,26 @@ class SurveyAdminSettings {
 			if ($row['multilang'] == 1 && $lang_id > 0) {
 				//echo '<p><span style="font-size:10px"> <a href="'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><img src="img_0/preview_red.png" /></a> <a href="'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'" target="_blank">'.SurveyInfo::getSurveyLink().'?language='.$lang_id.'</a></p>';
 			}
-			echo '<p><a href="index.php?anketa='.$this->anketa.'&a=prevajanje">'.$lang['srv_info_language'].'</a></p>';
-			
 			echo '<div class="standardne_besede">';
 			echo '<input type="hidden" name="extra_translations" value="1" />';			// da vemo, da nastavljamo ta besedila
+
+			// Tabela standardnih besed
+			echo '<table id="standard_words_table">';
+			echo '<tr>';
 			
-			echo '<p><span class="nastavitveSpan1 textleft">&nbsp;</span><span class="nastavitveSpan1 textleft" style="min-width:500px">'.($lang_id>0?$lang['srv_multilang']:$lang['srv_language_respons_1']).':';
-			
+			echo '<th>'.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).'</th>';
 			
+			echo '<th>'.$lang['srv_std_second'].': ';
 			$file = '../../lang/'.$lang_resp.'.php';
 			include($file);
-			echo ' '.$lang['language'].'</span><br></p>';
-			
-			// nazaj na administrativnega
+			echo $lang['language'].'</th>';
+
+			// nazaj na administrativni jezik
 			$file = '../../lang/'.$lang_admin.'.php';
 			include($file);
 			
-			
-			echo '<p>';
-			
-			echo '<span class="nastavitveSpan1 textleft">'.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).'</span>';
-			echo '<span class="nastavitveSpan1 textleft">'.$lang['srv_std_second'].'';
-			echo '</span>';
-			echo '<span class="bold">'.$lang['srv_std_translation'].' <a href="'.SurveyInfo::getSurveyLink().'&preview=on&language='.$lang_resp.'" target="_blank"><span class="faicon preview icon-as_link"></span></a></span>';
-			
-			echo '</p><hr>';
-			
-			echo '<p>';
+			echo '<th>'.$lang['srv_std_translation'].'</th>';
+			echo '</tr>';
 			
 			// jezik nastavimo na nastavitev za respondente, ker ta text dejansko nastavljamo
 			$file = '../../lang/'.$lang_resp.'.php';
@@ -1641,16 +1634,18 @@ class SurveyAdminSettings {
 			$this->extra_translation('srv_survey_non_active_notStarted', 1);
 			$this->extra_translation('srv_survey_non_active_expired', 1);
 			$this->extra_translation('srv_survey_non_active_voteLimit', 1);
-			
-						
-			echo '</p>';
-			
+
 			// nastavimo jezik nazaj
 			$file = '../../lang/'.$lang_admin.'.php';
 			include($file);
-			
+
+			echo '</table>';
+
 			echo '<div>';
-						
+			
+			//Link na zavihek Jezik
+			echo '<p><a href="index.php?anketa='.$this->anketa.'&a=prevajanje">'.$lang['srv_info_language'].'</a></p>';
+
 			echo '</fieldset>';
 			
 
@@ -2252,16 +2247,17 @@ class SurveyAdminSettings {
 		if($text == 'srv_nextpage_uvod')
 			$next_uvod = $lang_id == '' ? $admin_lang['srv_nextpage_uvod_desc'] : $resp_lang['srv_nextpage_uvod_desc'];
 		
-		echo '<div class="standardna-beseda"><span class="nastavitveSpan1 gray textleft">'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '<span class="gray italic">('.$next_uvod.')</span>' : '').'</span> ';
-		echo '<span class="nastavitveSpan1 textleft textItalic">'.$lang[$text].' </span>';
-		echo '<div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div>';
-		
+		echo '<tr class="standardna-beseda">';
+		echo '<td>'.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '<span class="gray italic">('.$next_uvod.')</span>' : '').'</td> ';
+		echo '<td>'.$lang[$text].'</td>';
+		echo '<td><div contentEditable="true" class="standardna-beseda-urejanje" name="srvlang_'.$text.$lang_id.'" id="srvlang_'.$text.$lang_id.'">'.$value.'</div></td>';
+
 		if($editor == 1) 
 			echo '<span class="faicon edit2 sb-edit"'.$onclick.' style="float:right; margin-top:1px; display:none;"></span>';
         
 		echo '<textarea name="srvlang_'.$text.$lang_id.'" id="polje_srvlang_'.$text.$lang_id.'"  style="display:none;">'.$value.'</textarea>';
         
-		echo '</div>';
+		echo '</tr>';
 	}
 	
 	function anketa_nice_links () {
@@ -4156,33 +4152,59 @@ class SurveyAdminSettings {
 	function arhivi() {//OSTANE
 		global $lang;
 		
-		echo '<fieldset style="width:100%">';
+		echo '<fieldset>';
 		echo '<legend >' . $lang['srv_questionnaire_archives'] . '</legend>';
-		
-		echo '<p style="margin-bottom:5px;"><span class="bold spaceRight" style="margin-top:5px;">' . $lang['srv_backup_label'] . '</span></p>';
-		echo '<p style="margin-top:5px;margin-bottom:10px;">'.$lang['srv_note'].': <input class="" name="intro_opomba" id="intro_opomba" type="text" style="width:400px"></p>';
-		
-		echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa=' . $this->anketa . '&a=backup_create" onclick="create_archive_survey(\'' . $this->anketa .'\',\'' . $lang['srv_wait_a_moment'] .'\'); return false;">';
-		echo $lang['srv_backup_button'];
-		echo '</a></div></span>';
-		
-		echo '<br /><br />';
+
+		echo '<p class="bottom16">'.$lang['srv_questionnaire_archives_text'].'</p>';
+
+		echo '<div class="setting_holder">';
+		echo $lang['srv_questionnaire_archives_note'].':';
+		echo '<input class="large w400" name="intro_opomba" id="intro_opomba" type="text"/>';
+		echo '</div>';
+
+		echo '<div class="button_holder">';
+		echo '<button class="medium blue" type="button" href="index.php?anketa=' . $this->anketa . '&a=backup_create" onclick="create_archive_survey(\'' . $this->anketa .'\',\'' . $lang['srv_wait_a_moment'] .'\'); return false;">'.$lang['srv_backup_button'].'</button>';
+		echo '</div>';
 		
 		// Seznam ustvarjenih arhivov
 		$sql = sisplet_query("SELECT a.id, a.naslov, a.intro_opomba, a.insert_time, a.edit_time, CONCAT(i.name, ' ', i.surname) AS insert_name, CONCAT(e.name, ' ', e.surname) AS edit_name FROM srv_anketa a, users i, users e WHERE a.insert_uid=i.id AND a.edit_uid=e.id AND a.backup = '$this->anketa' AND a.active>='0' ORDER BY a.insert_time DESC");
 		if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
 		
-		if (mysqli_num_rows($sql) > 0)
-			echo '<br /><strong>' . $lang['srv_backup_list'] . ':</strong>';
-		
-		while ($row = mysqli_fetch_array($sql)) {
-			echo '<div style="margin: 5px 0 10px 10px;">';
-			echo '<span class="bold"><a href="index.php?anketa=' . $row['id'] . '">' . $row['naslov'] . '</a></span> '.($row['intro_opomba']!='' ? ' - <i>'.$row['intro_opomba'].'</i>' : '');
-			echo '<br />(' . $lang['sent_by'] . ': <b>' . $row['insert_name'].'</b> ' . datetime($row['insert_time']) . ', ' . $lang['edit_by'] . ': <b>' . $row['edit_name'].'</b> ' . datetime($row['edit_time']) . ')';
-			echo '<br /><a href="#" onclick="javascript:anketa_delete(\'' . $row['id'] . '\', \'' . $lang['srv_anketadeleteconfirm'] . '\'); return false;">' . $lang['srv_survey_archives_delete_survey'] . '</a>, <a href="index.php?anketa=' . $row['id'] . '&a=backup_restore">' . $lang['srv_anketarestore'] . '</a>';
-			echo '</div>';
+		if (mysqli_num_rows($sql) > 0) {
+			echo '<p class="bold">' . $lang['srv_backup_list'] . ':</p>';
+
+			echo '<table id="survey_archives_table">';
+
+			echo '<tr>';
+			echo '<th>'.$lang['srv_questionnaire_archives_date'].'</th>';
+			echo '<th>'.$lang['srv_questionnaire_archives_by'].'</th>';
+			echo '<th>'.$lang['srv_questionnaire_archives_note2'].'</th>';
+			echo '<th></th>';
+			echo '</tr>';
+
+			while ($row = mysqli_fetch_array($sql)) {
+				echo '<tr>';
+				echo '<td>'.datetime($row['insert_time']).'</td>';
+				echo '<td>'.$row['insert_name'].'</td>';
+				echo '<td>'.($row['intro_opomba']!='' ? $row['intro_opomba'] : '/').'</td>';
+				
+				//Ikone
+				echo '<td class="right">';
+				echo '<div class="icon_holder multiple">';
+				echo '<a class="faicon" href="#" onclick="javascript:anketa_delete(\'' . $row['id'] . '\', \'' . $lang['srv_anketadeleteconfirm'] . '\'); return false;"><span class="faicon trash empty"></span></a>';
+				echo '<button class="table-inline white-black caps" type="button" onclick="window.location.href=\'index.php?anketa=' . $row['id'] . '&a=backup_restore\'">'.$lang['srv_questionnaire_archives_activate'].'</button>';
+				echo '</div>';
+				echo '</td>';
+				
+				echo '</tr>';
+			}
+	
+			echo '</table>';
+
 		}
 		
+		
+		
 		echo '</fieldset>';
 	}
 
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index 874e26e83..30ebe9610 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -168,52 +168,56 @@ class SurveyStaticHtml
         $this->survey_type = $sa->getSurvey_type($this->sid);
 
         echo '<div id="globalSetingsLinks" class="archive">';
-        echo '<ul class="">';
+        echo '<ul class="menu_left-list">';
 
         # arhivi vprasalnika
         if ($d->checkDostopSub('edit')) {
-            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] != 'data' && $_GET['m'] != 'changes' && $_GET['m'] != 'survey' && $_GET['m'] != 'survey_data' && $_GET['m'] != 'testdata' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[1] . '>';
+            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] != 'data' && $_GET['m'] != 'changes' && $_GET['m'] != 'survey' && $_GET['m'] != 'survey_data' && $_GET['m'] != 'testdata' ? ' class="active"' : '') . $_js_links[1] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '" title="' . $lang['srv_questionnaire_archives'] . '"><span>' . $lang['srv_questionnaire_archives'] . '</span></a>';
             echo '</li>';
         }
 
         # arhivi podatkov
         if ($d->checkDostopSub('edit') && $this->survey_type > 0) {
-            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[1] . '>';
+            echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' class="active"' : '') . $_js_links[1] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=data" title="' . $lang['srv_arhiv_data'] . '"><span>' . $lang['srv_arhiv_data'] . '</span></a>';
             echo '</li>';
         }
 
         # arhivi objave
         if ($d->checkDostopSub('publish')) {
-            echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[2] . '>';
+            echo '<li' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] == 'view_archive' ? ' class="active"' : '') . $_js_links[2] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_INVITATIONS . '&m=view_archive' . '" title="' . $lang['srv_archive_invitation'] . '"><span>' . $lang['srv_archive_invitation'] . '</span></a>';
             echo '</li>';
         }
 
         # arhivi analiz
         if ($d->checkDostopSub('analyse')) {
-            echo '<li' . ($_GET['a'] == A_ANALYSIS && $_GET['m'] == M_ANALYSIS_ARCHIVE ? ' class="highlightLineTab"' : ' class="nonhighlight"') . $_js_links[3] . '>';
+            echo '<li' . ($_GET['a'] == A_ANALYSIS && $_GET['m'] == M_ANALYSIS_ARCHIVE ? ' class="active"' : '') . $_js_links[3] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ANALYSIS . '&m=' . M_ANALYSIS_ARCHIVE . '" title="' . $lang['srv_archive_analysis'] . '"><span>' . $lang['srv_archive_analysis'] . '</span></a>';
             echo '</li>';
         }
 
+        echo '</ul>';
+
         # uvoz/izvoz ankete ali ankete s podatki
         if ($d->checkDostopSub('edit')) {
-            echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking highlightLineTab"' : ' class="navi_tracking nonhighlight"') . $_js_links[1] . '>';
+            echo '<ul class="menu_left-list">';
+            echo '<span class="menu_left-title">'.$lang['srv_survey_archives_other'].'</span>';
+            echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking active"' : ' class="navi_tracking"') . $_js_links[1] . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives'] . '"><span>' . $lang['srv_survey_archives'] . '</span></a>';
             echo '</li>';
 
             if ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data')) {
-                echo '<ul id="sub_navi_tracking">';
+                echo '<ul class="menu_left-list second" id="sub_navi_tracking">';
 
                 // Uvoz/izvoz ankete
-                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' && $_GET['appendMerge'] != '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey' && $_GET['appendMerge'] != '1' ? ' class="active"' : ' ') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives_ie'] . '"><span>' . $lang['srv_survey_archives_ie'] . '</span></a>';
                 echo '</li>';
 
                 // Uvoz/izvoz ankete in podatkov
-                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'survey_data' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey_data" title="' . $lang['srv_survey_archives_ie_data'] . '"><span>' . $lang['srv_survey_archives_ie_data'] . '</span></a>';
                 echo '</li>';
 
@@ -227,7 +231,7 @@ class SurveyStaticHtml
             $query_testdata = sisplet_query($str_testdata);
             list($testdata) = mysqli_fetch_row($query_testdata);
             if ((int)$testdata > 0) {
-                echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'testdata' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhiv_testdata'] . '"><span>' . $lang['srv_arhiv_testdata'] . '</span></a>';
                 echo '</li>';
             }
@@ -235,15 +239,15 @@ class SurveyStaticHtml
 
         # arhivi sprememb
         if ($d->checkDostopSub('edit')) {
-            echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA  ? ' class="navi_tracking highlightLineTab"' : ' class="navi_tracking nonhighlight"') . '>';
+            echo '<li' . ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA  ? ' class="navi_tracking active"' : ' class="navi_tracking"') . '>';
             echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking'] . '"><span>' . $lang['srv_survey_archives_tracking'] . '</span></a>';
             echo '</li>';
 
             if ($_GET['a'] == A_TRACKING || $_GET['a'] == A_TRACKING_HIERARHIJA) {
-                echo '<ul id="sub_navi_tracking">';
+                echo '<ul class="menu_left-list second" id="sub_navi_tracking">';
 
                 // Vse spremembe ankete
-                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] != 'tracking_data' && $_GET['appendMerge'] != '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] != 'tracking_data' && $_GET['appendMerge'] != '1' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '" title="' . $lang['srv_survey_archives_tracking_survey'] . '"><span>' . $lang['srv_survey_archives_tracking_survey'] . '</span></a>';
                 echo '</li>';
 
@@ -257,23 +261,23 @@ class SurveyStaticHtml
                 if ($hierarhija) {
 
                     // Vsi podatki o gradnji hierarhije, šifrantov in ostalega
-                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'hierarhija' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'hierarhija' ? ' class="active"' : '') . '>';
                     echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA. '&m=hierarhija" title="' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_structure'] . '</span></a>';
                     echo '</li>';
 
                     // Vse spremembe pri dodajanju udeležencev
-                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'udelezenci' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                    echo '<li ' . ($_GET['a'] == A_TRACKING_HIERARHIJA && $_GET['m'] == 'udelezenci' ? ' class="active"' : '') . '>';
                     echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING_HIERARHIJA . '&m=udelezenci" title="' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '"><span>' . $lang['srv_survey_archives_tracking_hierarchy_users'] . '</span></a>';
                     echo '</li>';
                 }
 
                 // Spremembe na podatkih
-                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['m'] == 'tracking_data' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&m=tracking_data" title="' . $lang['srv_survey_archives_tracking_data'] . '"><span>' . $lang['srv_survey_archives_tracking_data'] . '</span></a>';
                 echo '</li>';
 
                 // Append/Merge (uvozi)
-                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($_GET['a'] == A_TRACKING && $_GET['appendMerge'] == '1' ? ' class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_TRACKING . '&appendMerge=1" title="' . $lang['srv_survey_archives_tracking_append'] . '"><span>' . $lang['srv_survey_archives_tracking_append'] . '</span></a>';
                 echo '</li>';
 
diff --git a/lang/1.php b/lang/1.php
index f524c728b..b446df29f 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2327,7 +2327,7 @@ $lang = array (
     "srv_newfolder"         =>	 "Nova mapa",
     "srv_deletefolder"      =>	 "Izbri&#154;i mapo",
     "srv_backup"         	=>	 "Kreiraj arhivsko anketo",
-    "srv_backup_label"      =>	 "Izdelava arhivske verzije vpra&#353;alnika:",
+    "srv_backup_label"      =>	 "Izdelava arhivske verzije vprašalnika:",
     "srv_backup_data_label" =>	 "Izdelava arhivske kopije podatkov:",
     "srv_backup_button"     =>	 "Izdelaj arhivsko verzijo vprašalnika",
     "srv_backup_data_button"=>	 "Izdelaj arhivsko kopijo podatkov",
@@ -4081,13 +4081,19 @@ $lang = array (
 	"srv_printouts_q"					=>	"Izpisi vpra&#353;alnika",
 	"srv_printouts_q"					=>	"Izpisi vpra&#353;alnika",
 	"srv_archival_version_q"			=>	"Arhivske verzije vpra&#353;alnika",
-	"srv_questionnaire_archives"		=>	"Arhivi vpra&#353;alnika",
-	"srv_survey_archives"				=>	"Izvoz",
+	"srv_questionnaire_archives"		=>	"Arhivi vprašalnika",
+	"srv_questionnaire_archives_text"		=>	"Pred spreminjanjem vprašalnika lahko obstoječo verzijo vprašalnika shranite tako, da izdelate arhivsko verzijo. Arhiv se izdela brez podatkov respondentov. S klikom na 'Izdelaj arhivsko verzijo vprašalnika' se v spodnjem seznamu generira arhivska verzija vprašalnika. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
+	"srv_questionnaire_archives_note"		=>	"Opomba k arhivski verziji",
+	"srv_questionnaire_archives_date"		=>	"Datum arhiviranja",
+	"srv_questionnaire_archives_by"		=>	"Arhiviral/-a",
+	"srv_questionnaire_archives_note2"		=>	"Opomba",
+	"srv_questionnaire_archives_activate"		=>	"Aktivacija",
+	"srv_survey_archives"				=>	"Izvozi",
 	"srv_survey_archives_ie"			=>	"Vprašalnik",
 	"srv_survey_archives_ie_title"		=>	"Izvoz vprašalnika",
 	"srv_survey_archives_ie_data"		=>	"Vprašalnik in podatki",
 	"srv_survey_archives_ie_data_title"		=>	"Izvoz vprašalnika in podatkov",
-	"srv_survey_archives_tracking"		=>	"Zgodovina sprememb",
+	"srv_survey_archives_tracking"		=>	"Spremembe",
 	"srv_survey_archives_tracking_survey"	=>	"Spremembe vprašalnika",
 	"srv_survey_archives_tracking_data"		=>	"Spremembe podatkov",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (uvozi)",
@@ -4107,6 +4113,7 @@ $lang = array (
 	"srv_survey_archives_survey"		=>	"<b>Shrani arhivsko datoteko vprašalnika</b>",
 	"srv_survey_archives_data"			=>	"<b>Shrani arhivsko datoteko vprašalnika s podatki</b>",
 	"srv_survey_archives_delete_survey"	=>	"Izbriši arhivsko verzijo vprašalnika",
+	"srv_survey_archives_other"			=>	"Ostalo",
 	"srv_tracking_label"				=>	"Sledenje spremembam (tracking)",
 	"link_parent_content"				=>	"Odpri meni, a ohrani vsebino star&#154;a",
 	"link_prev_content"				=>	"Odpri meni, a ohrani vsebino prej odprte strani",
diff --git a/lang/2.php b/lang/2.php
index f46973a04..61e9eea25 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4063,12 +4063,18 @@ $lang = array (
 	"srv_printouts_q"					=>	"Questionnaire printouts",
 	"srv_archival_version_q"			=>	"Questionnaire archive",
 	"srv_questionnaire_archives"		=>	"Questionnaire archive",
-	"srv_survey_archives"				=>	"Export",
+	"srv_questionnaire_archives_text"		=>	"Before modifying the questionnaire, you can save the existing version of the questionnaire by creating an archive version. The archive is created without the respondents' data. Clicking on 'Create archive version of questionnaire' will generate an archive version of the questionnaire in the list below. Each archive version of the questionnaire can be activated. When activated, the archive version is automatically created as a new survey.",
+	"srv_questionnaire_archives_note"		=>	"Archive version note",
+	"srv_questionnaire_archives_date"		=>	"Archive date",
+	"srv_questionnaire_archives_by"		=>	"Archived by",
+	"srv_questionnaire_archives_note2"		=>	"Note",
+	"srv_questionnaire_archives_activate"		=>	"Activation",
+	"srv_survey_archives"				=>	"Exports",
 	"srv_survey_archives_ie"			=>	"Survey",
 	"srv_survey_archives_ie_title"		=>	"Survey import / export",
 	"srv_survey_archives_ie_data"		=>	"Survey and data",
 	"srv_survey_archives_ie_data_title"		=>	"Survey and data import / export",
-	"srv_survey_archives_tracking"		=>	"Change history",
+	"srv_survey_archives_tracking"		=>	"Changes",
 	"srv_survey_archives_tracking_survey"	=>	"Survey changes",
 	"srv_survey_archives_tracking_data"		=>	"Data changes",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (imports)",
@@ -4088,6 +4094,7 @@ $lang = array (
 	"srv_survey_archives_survey"		=>	"<b>Save questionnaire archive file</b>",
 	"srv_survey_archives_data"			=>	"<b>Save questionnaire and data archive file</b>",
 	"srv_survey_archives_delete_survey"	=>	"Delete archive survey",
+	"srv_survey_archives_other"			=>	"Other",
 	"srv_tracking_label"				=>	"Changes tracking",
 	"link_parent_content"				=>	"Open menu, but keep parent's content",
 	"link_prev_content"				=>	"Open menu, but keep previous page's content",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6883dd3cc..3470de023 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5083,6 +5083,10 @@ p, span {
   font-weight: 600;
 }
 
+.heavy {
+  font-weight: 900;
+}
+
 .caps {
   text-transform: uppercase;
 }
@@ -5207,6 +5211,7 @@ div.icon_holder button.ui-datepicker-trigger {
 }
 div.icon_holder.multiple span.faicon,
 div.icon_holder.multiple a.faicon {
+  margin-left: 0;
   margin-right: 16px;
 }
 div.icon_holder.multiple span.faicon:last-of-type,
@@ -5927,6 +5932,10 @@ span.faicon.vote-yes::before {
   content: "";
 }
 
+span.faicon.file-preview::before {
+  content: "";
+}
+
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
@@ -7289,6 +7298,7 @@ submit.table-inline {
   width: fit-content;
   font-size: 14px;
   border-radius: 2px;
+  margin-left: 16px;
 }
 button.small,
 submit.small {
@@ -7420,6 +7430,9 @@ input[type=text], input[type=password] {
 input[type=text].w200, input[type=password].w200 {
   width: 200px;
 }
+input[type=text].w400, input[type=password].w400 {
+  width: 400px;
+}
 input[type=text].wauto, input[type=password].wauto {
   width: auto;
 }
@@ -7621,6 +7634,13 @@ select.dropdown.small option {
 select.dropdown.w200 {
   width: 200px;
 }
+select.dropdown.w130 {
+  width: 130px;
+}
+select.dropdown.inline {
+  margin-left: 24px;
+  margin-top: 0;
+}
 select.dropdown:focus {
   outline-style: none;
   box-shadow: none;
@@ -7666,7 +7686,7 @@ table {
   text-align: left;
 }
 table td, table th {
-  padding: 0 16px;
+  padding: 8px 16px;
   border-top: 1px solid #E5E5E5;
   vertical-align: middle;
 }
@@ -13299,6 +13319,27 @@ li.if_editing div.if_content:before {
   z-index: -1;
 }
 
+span.IF_title_start {
+  font-weight: 900;
+  color: #1E88E5;
+  margin-right: 8px;
+}
+
+span.IF_title {
+  font-weight: 600;
+  text-transform: uppercase;
+}
+
+span.IF_title_line {
+  content: "";
+  display: inline-block;
+  height: 0.5em;
+  vertical-align: bottom;
+  width: 100%;
+  margin-top: 8px;
+  border-top: 1px solid #C4C4C4;
+}
+
 span.conditions_display {
   display: block;
   line-height: 28px;
@@ -13329,16 +13370,15 @@ span.endif {
   padding-top: 6px;
 }
 
-#div_condition_editing_inner > .condition_editing_preview {
-  background-color: #1E88E5;
-  padding-left: 6px;
+#div_condition_editing_inner {
+  background-color: #F2F2F2;
+  padding: 16px;
 }
 #div_condition_editing_inner .condition_editing_body {
   max-height: 50vh;
   overflow-y: auto;
   margin: 20px 0;
   padding: 10px 5px 5px 5px;
-  border: 1px #E5E5E5 solid;
 }
 #div_condition_editing_inner .condition_editing_body .tbl_condition_editing {
   margin-bottom: 5px;
@@ -14247,7 +14287,7 @@ and open the template in the editor.
   margin-bottom: 32px;
   border: solid 1px #E5E5E5;
   width: 292px;
-  height: 205px;
+  height: 218px;
   transition: 0.1s;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template:hover {
@@ -14260,27 +14300,32 @@ and open the template in the editor.
   font-weight: 900;
   text-transform: uppercase;
   background-color: #F8F8F8;
-  padding: 19px 11px 19px;
+  padding: 16px 12px 16px;
+  height: 40px;
+  display: flex;
+  align-items: center;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_content {
   overflow: hidden;
-  margin: 16px 11px;
+  padding: 16px 12px;
+  height: 80px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template .template_preview {
   bottom: 0;
-  margin: 0 11px;
+  padding: 0 12px 16px;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected {
-  cursor: pointer;
-  border-color: #808080;
-  background-color: #C4C4C4;
+  border-color: #1E88E5;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected .template_title {
-  background-color: #808080;
+  background-color: #1E88E5;
   color: #FFFFFF;
 }
-#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected .template_preview a {
-  color: #FFFFFF;
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected:hover {
+  background-color: #fafafa;
+}
+#new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template .noSurvey_template_wrap .noSurvey_template_holder .template.selected:hover .template_title {
+  background-color: #1980da;
 }
 #new_anketa_div .layout_right_item .layout_right_centering .noSurvey_template select.template_type_menu {
   display: none;
diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss
index 16ed8a398..3a3351e6b 100644
--- a/resources/sass/admin_new/basic/icons/icons.scss
+++ b/resources/sass/admin_new/basic/icons/icons.scss
@@ -81,6 +81,7 @@ div.icon_holder {
     &.multiple {
         span.faicon,
         a.faicon{
+            margin-left: 0;
             margin-right: 16px;
             &:last-of-type {
             margin-right: 0px;
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index 3762e5de5..3c112f8a7 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -605,4 +605,9 @@ span.faicon.list-alt::before{
 //Glasovanje
 span.faicon.vote-yes::before{
         content: "\f772";
+}
+
+//Preview
+span.faicon.file-preview::before{
+        content: "\f865";
 }
\ No newline at end of file
diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss
index d30c0e05f..a3e9fe125 100644
--- a/resources/sass/admin_new/basic/typography.scss
+++ b/resources/sass/admin_new/basic/typography.scss
@@ -30,6 +30,10 @@ p,span {
 	font-weight: $semi-bold;
 }
 
+.heavy {
+	font-weight: $heavy;
+}
+
 .caps {
 	text-transform: uppercase;
 }
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index 96436a9cc..5dbb707cf 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -18,6 +18,7 @@ submit{
         width: fit-content;
         font-size: 14px;
         border-radius: 2px;
+        margin-left: 16px;
     }
     
     &.small{
diff --git a/resources/sass/admin_new/components/form/dropdown.scss b/resources/sass/admin_new/components/form/dropdown.scss
index d90660fc4..798be3a42 100644
--- a/resources/sass/admin_new/components/form/dropdown.scss
+++ b/resources/sass/admin_new/components/form/dropdown.scss
@@ -50,7 +50,14 @@ select.dropdown {
 
     &.w200 {
         width: 200px;
-        }
+    }
+    &.w130 {
+        width: 130px;
+    }
+    &.inline {
+        margin-left: 24px;
+        margin-top: 0;
+    }    
 
     &:focus {
         outline-style: none;
diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss
index 0d95af91a..5c773d0a3 100644
--- a/resources/sass/admin_new/components/form/input.scss
+++ b/resources/sass/admin_new/components/form/input.scss
@@ -28,7 +28,10 @@ input {
         font-family: $font_family;
 
         &.w200 {
-        width: 200px;
+            width: 200px;
+        }
+        &.w400 {
+            width: 400px;
         }
         &.wauto {
             width: auto;
diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss
index 805e4abdd..ef3ab9145 100644
--- a/resources/sass/admin_new/components/table/table.scss
+++ b/resources/sass/admin_new/components/table/table.scss
@@ -5,7 +5,7 @@ table {
     text-align: left;
 
     td, th {
-        padding: 0 16px;
+        padding: 8px 16px;
         border-top: 1px solid $gray;
         vertical-align: middle;
 
diff --git a/resources/sass/admin_new/pages/new_survey_page/right_content.scss b/resources/sass/admin_new/pages/new_survey_page/right_content.scss
index eac94080d..4f914a1f6 100644
--- a/resources/sass/admin_new/pages/new_survey_page/right_content.scss
+++ b/resources/sass/admin_new/pages/new_survey_page/right_content.scss
@@ -413,7 +413,7 @@ $skin_selector: $red;
 							margin-bottom: 32px;
 							border: solid 1px $gray;
 							width: 292px;
-							height: 205px;
+							height: 218px;
 
 							transition: 0.1s;
 
@@ -429,35 +429,40 @@ $skin_selector: $red;
 								text-transform: uppercase;
 
 								background-color: $light-gray;
-								padding: 19px 11px 19px;
+								padding: 16px 12px 16px;
+
+								height: 40px;
+								display: flex;
+								align-items: center;
 
 							}
 							
 							.template_content {
 								overflow: hidden;
-								margin: 16px 11px;
+								padding: 16px 12px;
+								height: 80px;
 							}
 
 							.template_preview {
 								bottom: 0;
-								margin: 0 11px;
+								padding: 0 12px 16px;
 							}
 
 							&.selected {
-								cursor: pointer;
-								border-color: $very-dark-gray2;
-								background-color: $dark-gray;
+								border-color: $blue;
 
 								.template_title{
-									background-color: $very-dark-gray2;
+									background-color: $blue;
 									color: $white;
 								}
 
-								.template_preview {
-									a {
-										color: $white;
+								&:hover {
+									background-color: darken($white,2%);
+									.template_title{
+										background-color: darken($blue,3%);
 									}
 								}
+
 							}
 						}
 						
diff --git a/resources/sass/admin_new/pages/survey_edit/conditions.scss b/resources/sass/admin_new/pages/survey_edit/conditions.scss
index acd10d6b7..fa846fca2 100644
--- a/resources/sass/admin_new/pages/survey_edit/conditions.scss
+++ b/resources/sass/admin_new/pages/survey_edit/conditions.scss
@@ -76,6 +76,29 @@ li.if_editing {
 		}
 	}
 }
+
+// Naslov popupa, črta pod naslovom
+span.IF_title_start {
+    font-weight: $heavy;
+    color: $blue;
+    margin-right: 8px;
+}
+
+span.IF_title {
+    font-weight: $semi-bold;
+    text-transform: uppercase;
+}
+
+span.IF_title_line {
+    content: "";
+    display: inline-block;
+    height: 0.5em;
+    vertical-align: bottom;
+    width: 100%;
+    margin-top: 8px;
+    border-top: 1px solid $dark-gray;
+}
+
 span.conditions_display {
 	display: block;
 	line-height: 28px;
@@ -111,9 +134,11 @@ span.endif {
 	}
 }
 #div_condition_editing_inner {
+
+	background-color: $light-gray2;
+	padding: 16px;
+
 	>.condition_editing_preview {
-		background-color: $blue;
-		padding-left: 6px;
 	}
 
     .condition_editing_body{
@@ -123,7 +148,6 @@ span.endif {
         margin: 20px 0;
         padding: 10px 5px 5px 5px;
 
-        border: 1px $gray solid;
 
         .tbl_condition_editing{
             margin-bottom: 5px;