diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index c49c0f7ae..810856e20 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -897,16 +897,18 @@ class SurveyAdmin
 
         echo '<div id="firstNavigation" >';
 
-        echo '<div id="mojeAnketeLink">';
-        echo '<a href="index.php?a=pregledovanje" title="' . $lang['srv_pregledovanje'] . ' (' . strtolower($lang['srv_create_survey']) . ', ' . strtolower($lang['srv_library']) . ')">'/*<span class="sprites moje_ankete_off"></span>*/.'<span class="library_link">' . $lang['srv_pregledovanje'] . '</span></a>';
-        echo '</div>';
+        echo '<ol class="navigation_buttons_list '.($this->isAnketar == true ? ' displayNone' : '').'">';
 
+        // Moje ankete
+        echo '<li>';
+        echo '  <div id="mojeAnketeLink">';
+        echo '      <a href="index.php?a=pregledovanje" title="' . $lang['srv_pregledovanje'] . ' (' . strtolower($lang['srv_create_survey']) . ', ' . strtolower($lang['srv_library']) . ')"><span class="library_link">' . $lang['srv_pregledovanje'] . '</span></a>';
+        echo '  </div>';
+        echo '</li>';
 
-        echo '<ol class="'.($this->isAnketar == true ? ' visibility_hidden' : '').'">';
+        if ($this->skin == 0 && $this->isAnketar == false) {
 
-        if ($this->skin == 0 /*&& $this->checkDostopAktiven()*/ && $this->isAnketar == false) {
-
-            echo '<li>';
+            echo '<li class="active_'.$css_status.'">';
 
             if ($d->checkDostopSub('dashboard'))
                 echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_REPORTI . '" title="' . $lang['srv_navigation_status'] . '">';
@@ -933,13 +935,11 @@ class SurveyAdmin
             echo '</li>';
         }
 
-        echo '<li>';
+        echo '<li class="active_'.$css_urejanje.'">';
         if ($d->checkDostopSub('edit') && $hierarhija_type < 5) {
             echo '<a href="index.php?anketa=' . $this->anketa . ($this->survey_type > 1 ? '&a=' . A_BRANCHING : '') . '" title="' . $lang['srv_vprasalnik'] . '">';
         }
-        echo '<div class="left-' . $css_urejanje . '">&nbsp;</div>';
         echo '<div class="step-' . $css_urejanje . '">' . $lang['srv_vprasalnik'] . '</div>';
-        //echo $css_urejanjeRight;
         if ($d->checkDostopSub('edit') && $hierarhija_type < 5) {
             echo '</a>';
         }
@@ -948,16 +948,14 @@ class SurveyAdmin
         # testiranje - ne prikazemo v glasovanju
         if ($this->survey_type != 0 && $this->survey_type != 1) {
 
-            echo '<li>';
+            echo '<li class="active_'.$css_testiranje.'">';
             if ($d->checkDostopSub('test')) {
                 echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '" title="' . $lang['srv_testiranje'] . '">';
             }
             echo '<div class="step-' . $css_testiranje . '">' . $lang['srv_testiranje'] . '</div>';
-            //echo $css_testiranjeRight;
             if ($d->checkDostopSub('test')) {
                 echo '</a>';
             }
-
             echo '</li>';
         }
 
@@ -970,7 +968,7 @@ class SurveyAdmin
             $link = A_VABILA;
         }
 
-        echo '<li>';
+        echo '<li class="active_'.$css_objava.'">';
         if ($d->checkDostopSub('publish')) {
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . $link . '" title="' . $lang['srv_vabila'] . '">';
         }
@@ -984,12 +982,11 @@ class SurveyAdmin
         // Podatki - ne prikazemo v glasovanju
         if ($this->survey_type != 0) {
 
-            echo '<li>';
+            echo '<li class="active_'.$css_data.'">';
             if ($d->checkDostopSub('data')) {
                 echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '" title="' . $lang['srv_results'] . '">';
             }
             echo '<div class="step-' . $css_data . '">' . $lang['srv_results'] . '</div>';
-            //echo $css_dataRight;
             if ($d->checkDostopSub('data')) {
                 echo '</a>';
             }
@@ -1008,17 +1005,14 @@ class SurveyAdmin
             $_goto_m = '&m=' . M_ANALYSIS_SUMMARY;
         }
 
-        echo '<li>';
-
+        echo '<li class="active_'.$css_analysis.'">';
         if ($d->checkDostopSub('analyse') && !isset($modules['hierarhija'])) {
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . $_goto_m . '" title="' . $lang['srv_analiza'] . '">';
-
         } 
         elseif ($d->checkDostopSub('analyse') && isset($modules['hierarhija'])) {
             echo '<a href="#" title="' . $lang['srv_analiza_hierarchy'] . '">';
         }
         echo '<div class="step-' . $css_analysis . '">' . $lang['srv_analiza'] . '</div>';
-
         if ($d->checkDostopSub('analyse')) {
             echo '</a>';
         }
@@ -1029,7 +1023,7 @@ class SurveyAdmin
 
         $d = new Dostop();
         if ($d->checkDostopAktiven()) {
-            echo '<ol class="quick_settings' . ($this->isAnketar == true ? ' visibility_hidden' : '') . '">';
+            echo '<ol class="quick_settings' . ($this->isAnketar == true ? ' displayNone' : '') . '">';
 
             # Komentarji
             SurveySetting::getInstance()->Init($this->anketa);
@@ -1135,14 +1129,12 @@ class SurveyAdmin
 
 
         # zavhiki dodatnih nastavitev
-        echo '<ol class="smaller right-side">';
+        echo '<ol class="navigation_modules">';
 
         # MAZA - mobilna aplikacija za anketirance
         if (isset($modules['maza'])) {
             $css = ($this->first_action == A_MAZA) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_MAZA . '" title="' . $lang['srv_maza'] . '">';
             echo '<span class="module_icon maza"></span>';
@@ -1153,8 +1145,6 @@ class SurveyAdmin
         if (isset($modules['wpn'])) {
             $css = ($this->first_action == A_WPN) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_WPN . '" title="' . $lang['srv_wpn'] . '">';
             echo '<span class="module_icon wpn"></span>';
@@ -1165,8 +1155,6 @@ class SurveyAdmin
         if (isset($modules['phone'])) {
             $css = ($this->first_action == NAVI_PHONE) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             # če je navadni user in anketar
             if ($this->isAnketar) {
@@ -1182,8 +1170,6 @@ class SurveyAdmin
         if (isset($modules['slideshow'])) {
             $css = ($this->first_action == NAVI_SLIDESHOW) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_SLIDESHOW . '" title="' . $lang['srv_vrsta_survey_type_9'] . '">';
             echo '<span class="module_icon slideshow"></span>';
@@ -1194,8 +1180,6 @@ class SurveyAdmin
         if (isset($modules['uporabnost'])) {
             $css = ($this->first_action == NAVI_UPORABNOST) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_UPORABNOST . '" title="' . $lang['srv_uporabnost'] . '">';
             echo '<span class="module_icon evalvation"></span>';
@@ -1206,8 +1190,6 @@ class SurveyAdmin
         if ($row['user_from_cms'] >= 1) {
             $css = ($this->first_action == NAVI_VNOS) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COOKIE . '" title="' . $lang['srv_vnos'] . '">';
             echo '<span class="module_icon vnos"></span>';
@@ -1218,8 +1200,6 @@ class SurveyAdmin
         if (isset($modules['social_network'])) {
             $css = ($this->first_action == NAVI_VNOS) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '">';
             echo '<span class="module_icon social"></span>';
@@ -1230,8 +1210,6 @@ class SurveyAdmin
         if (isset($modules['quiz'])) {
             $css = ($this->first_action == A_KVIZ) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_KVIZ . '" title="' . $lang['srv_vrsta_survey_type_6'] . '">';
             echo '<span class="module_icon quiz"></span>';
@@ -1242,8 +1220,6 @@ class SurveyAdmin
         if (isset($modules['voting'])) {
             $css = ($this->first_action == A_VOTING) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_VOTING . '" title="' . $lang['srv_vrsta_survey_type_18'] . '">';
             echo '<span class="module_icon voting"></span>';
@@ -1254,8 +1230,6 @@ class SurveyAdmin
         if (isset($modules['advanced_paradata'])) {
             $css = ($this->first_action == A_ADVANCED_PARADATA) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ADVANCED_PARADATA . '" title="' . $lang['srv_vrsta_survey_type_16'] . '">';
             echo '<span class="module_icon advanced_paradata"></span>';
@@ -1266,8 +1240,6 @@ class SurveyAdmin
         if (isset($modules['excell_matrix'])) {
             $css = ($this->first_action == 'excell_matrix') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=excell_matrix" title="Excelleration matrix">';
             echo '<span class="module_icon excell_matrix"></span>';
@@ -1278,8 +1250,6 @@ class SurveyAdmin
         if (isset($modules['chat'])) {
             $css = ($this->first_action == A_CHAT) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_CHAT . '" title="' . $lang['srv_vrsta_survey_type_14'] . '">';
             echo '<span class="module_icon chat"></span>';
@@ -1290,8 +1260,6 @@ class SurveyAdmin
         if (isset($modules['panel'])) {
             $css = ($this->first_action == A_PANEL) ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PANEL . '" title="' . $lang['srv_vrsta_survey_type_15'] . '">';
             echo '<span class="module_icon panel"></span>';
@@ -1302,8 +1270,6 @@ class SurveyAdmin
         if (isset($modules['evoli'])) {
             $css = ($this->first_action == 'evoli') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=evoli" title="Evoli">';
             echo '<span class="module_icon evoli"></span>';
@@ -1314,8 +1280,6 @@ class SurveyAdmin
         if (isset($modules['evoli_teammeter'])) {
             $css = ($this->first_action == 'evoli_teammeter') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=evoli_teammeter" title="Evoli team meter">';
             echo '<span class="module_icon evoli_teammeter"></span>';
@@ -1326,8 +1290,6 @@ class SurveyAdmin
         if (isset($modules['evoli_quality_climate'])) {
             $css = ($this->first_action == 'evoli_quality_climate') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=evoli_quality_climate" title="Evoli quality climate">';
             echo '<span class="module_icon evoli_quality_climate"></span>';
@@ -1338,8 +1300,6 @@ class SurveyAdmin
         if (isset($modules['evoli_teamship_meter'])) {
             $css = ($this->first_action == 'evoli_teamship_meter') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=evoli_teamship_meter" title="Evoli teamship meter">';
             echo '<span class="module_icon evoli_teamship_meter"></span>';
@@ -1350,8 +1310,6 @@ class SurveyAdmin
         if (isset($modules['evoli_organizational_employeeship_meter'])) {
             $css = ($this->first_action == 'evoli_organizational_employeeship_meter') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=evoli_organizational_employeeship_meter" title="Evoli organizational employeeship meter">';
             echo '<span class="module_icon evoli_organizational_employeeship_meter"></span>';
@@ -1362,8 +1320,6 @@ class SurveyAdmin
         if (isset($modules['evoli_employmeter'])) {
             $css = ($this->first_action == 'evoli_employmeter') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=evoli_employmeter" title="Evoli employeeship meter">';
             echo '<span class="module_icon evoli_employmeter"></span>';
@@ -1374,8 +1330,6 @@ class SurveyAdmin
         if (isset($modules['mfdps'])) {
             $css = ($this->first_action == 'mfdps') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=mfdps" title="MFDPŠ">';
             echo '<span class="module_icon mfdps"></span>';
@@ -1386,8 +1340,6 @@ class SurveyAdmin
         if (isset($modules['borza'])) {
             $css = ($this->first_action == 'borza') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=borza" title="BORZA">';
             echo '<span class="module_icon borza"></span>';
@@ -1398,8 +1350,6 @@ class SurveyAdmin
         if (isset($modules['mju'])) {
             $css = ($this->first_action == 'mju') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=mju" title="MJU">';
             echo '<span class="module_icon mju"></span>';
@@ -1410,8 +1360,6 @@ class SurveyAdmin
         if (isset($modules['360_stopinj'])) {
             $css = ($this->first_action == '360_stopinj') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=360_stopinj" title="' . $lang['srv_360_reports'] . '">';
             echo '<span class="module_icon degrees"></span>';
@@ -1422,8 +1370,6 @@ class SurveyAdmin
         if (isset($modules['360_stopinj_1ka'])) {
             $css = ($this->first_action == '360_stopinj_1ka') ? 'on' : 'off';
 
-            echo '<li class="space">&nbsp;</li>';
-
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=360_stopinj_1ka" title="' . $lang['srv_360_reports'] . '">';
             echo '<span class="module_icon degrees_1ka"></span>';
@@ -1433,8 +1379,6 @@ class SurveyAdmin
 		# GDPR
 		$gdpr = new GDPR();
         if (true /*$gdpr->isGDPRSurvey($this->anketa)*/) {
-			
-            echo '<li class="space">&nbsp;</li>';
 
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=gdpr_settings" title="' . $lang['srv_gdpr'] . '">';
@@ -1444,7 +1388,6 @@ class SurveyAdmin
         }
         # SA - hierarhija
         if (isset($modules['hierarhija'])) {
-            echo '<li class="space">&nbsp;</li>';
 
             echo '<li>';
                 if($modules['hierarhija'] == 1) {
@@ -1469,7 +1412,6 @@ class SurveyAdmin
             echo '</li>';
         }
         elseif(UserSetting::getInstance()->getUserSetting('showSAicon') && $admin_type < 3){
-            echo '<li class="space">&nbsp;</li>';
 
             echo '<li>';
             echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' .  A_HIERARHIJA_SUPERADMIN  . '&amp;m='.M_HIERARHIJA_STATUS.'" title="' . $lang['srv_hierarchy'] . '">';
@@ -1507,77 +1449,66 @@ class SurveyAdmin
         # podzavihek: urejanje ankete
         if ($this->first_action == NAVI_UREJANJE) {
 
-            echo '<ul class="secondNavigation ' . ($this->isAnketar == true ? ' visibility_hidden' : '') . '">';
+            echo '<ul class="secondNavigation ' . ($this->isAnketar == true ? ' displayNone' : '') . '">';
 
 			#zavihek vprasalnik *
-            echo '<li>';
-            echo '<a class="no-img side-left' . ($this->second_action == NAVI_UREJANJE_BRANCHING ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . ($this->survey_type > 1 ? '&a=' . A_BRANCHING : '') . '" title="' . $lang['srv_editirajanketo2'] . '">';
+            echo '<li class="'.($this->second_action == NAVI_UREJANJE_BRANCHING ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . ($this->survey_type > 1 ? '&a=' . A_BRANCHING : '') . '" title="' . $lang['srv_editirajanketo2'] . '">';
             echo $lang['srv_editirajanketo2'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
 
             #zavihek urejanje akete
-            echo '<li>';
-            echo '<a class="no-img' . ($this->second_action == NAVI_UREJANJE_ANKETA ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&a=' . A_SETTINGS . '" title="' . $lang['srv_nastavitve_ankete'] . '">';
+            echo '<li class="'.($this->second_action == NAVI_UREJANJE_ANKETA ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_SETTINGS . '" title="' . $lang['srv_nastavitve_ankete'] . '">';
             echo $lang['srv_nastavitve_ankete'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
 
             # zavihek oblika
-            echo '<li>';
-            echo '<a class="no-img side-right' . ($this->second_action == NAVI_UREJANJE_TEMA ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TEMA . '" title="' . $lang['srv_themes'] . '">';
+            echo '<li class="'.($this->second_action == NAVI_UREJANJE_TEMA ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TEMA . '" title="' . $lang['srv_themes'] . '">';
             echo $lang['srv_themes'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
 
             echo '</ul>';
 
+
+            # link arhivi
             if (!$this->isAnketar) {
                 echo '<ul class="secondNavigationArchive">';
-                # link arhivi
-                echo '<li class="' . ($get == A_ARHIVI || $get == A_TRACKING ? ' aactive' : '') . '">';
-                echo '<a class="' . ($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '') . '"'
-                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ARHIVI . '" title="' . $lang['srv_arhivi'] . '">';
-                //echo $lang['srv_arhivi'];
-                echo /*'<span class="sprites archive"></span>' .*/ $lang['srv_analiza_arhiv'];
+
+                echo '<li class="'.($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '').'">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ARHIVI . '" title="' . $lang['srv_arhivi'] . '">';
+                echo $lang['srv_analiza_arhiv'];
                 echo '</a>';
                 echo '</li>';
+
                 echo '</ul>';
             }
         }
 
         # podzavihek: testiranje
         if ($this->first_action == NAVI_TESTIRANJE) {
-            //$tab = $_GET['m'];
+
             echo '<ul class="secondNavigation">';
-            echo '<li>';
-            echo '<a class="no-img side-left' . ($this->second_action == M_TESTIRANJE_DIAGNOSTIKA ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_DIAGNOSTIKA . '" title="' . $lang['srv_testiranje_diagnostika'] . '">';
+            echo '<li class="'.($this->second_action == M_TESTIRANJE_DIAGNOSTIKA ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_DIAGNOSTIKA . '" title="' . $lang['srv_testiranje_diagnostika'] . '">';
             echo $lang['srv_testiranje_diagnostika'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
 
              # zavihek trajanje
-            echo '<li>';
-            echo '<a class="no-img' . ($this->second_action == NAVI_TESTIRANJE_PREDVIDENI || $this->second_action == NAVI_TESTIRANJE_CAS ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . A_TRAJANJE_PREDVIDENI . '" title="' . $lang['srv_testiranje_trajanje'] . '">';
+            echo '<li class="'.($this->second_action == NAVI_TESTIRANJE_PREDVIDENI || $this->second_action == NAVI_TESTIRANJE_CAS ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . A_TRAJANJE_PREDVIDENI . '" title="' . $lang['srv_testiranje_trajanje'] . '">';
             echo $lang['srv_testiranje_trajanje'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
             
             # zavihek komentarji
-            echo '<li>';
-            echo '<a class="no-img' . ($this->second_action == NAVI_TESTIRANJE_KOMENTARJI || $this->second_action == NAVI_TESTIRANJE_KOMENTARJI_ANKETA ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji'] . '">';
+            echo '<li class="'.($this->second_action == NAVI_TESTIRANJE_KOMENTARJI || $this->second_action == NAVI_TESTIRANJE_KOMENTARJI_ANKETA ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_KOMENTARJI . '" title="' . $lang['srv_testiranje_komentarji'] . '">';
             echo $lang['srv_testiranje_komentarji'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
-            echo '<li>';
-            echo '<a class="no-img side-right' . ($this->second_action == NAVI_TESTIRANJE_VNOSI ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_VNOSI . '" title="' . $lang['srv_testiranje_vnosi'] . '">';
+
+            echo '<li class="'.($this->second_action == NAVI_TESTIRANJE_VNOSI ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TESTIRANJE . '&amp;m=' . M_TESTIRANJE_VNOSI . '" title="' . $lang['srv_testiranje_vnosi'] . '">';
             echo $lang['srv_testiranje_vnosi'] . '</a>';
             echo '</li>';
 
@@ -1589,15 +1520,16 @@ class SurveyAdmin
                 $query_testdata = sisplet_query($str_testdata);
                 [$testdata] = mysqli_fetch_row($query_testdata);
 
+                # link arhivi
                 if ((int)$testdata > 0) {
                     echo '<ul class="secondNavigationArchive">';
-                    # link arhivi
-                    echo '<li>';
-                    echo '<a class="' . ($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '') . '"'
-                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhivi'] . '">';
-                    echo /*'<span class="sprites archive"></span>' .*/ $lang['srv_analiza_arhiv'];
+                    
+                    echo '<li class="'.($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '').'">';
+                    echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ARHIVI . '&m=testdata" title="' . $lang['srv_arhivi'] . '">';
+                    echo $lang['srv_analiza_arhiv'];
                     echo '</a>';
                     echo '</li>';
+
                     echo '</ul>';
                 }
             }
@@ -1611,38 +1543,34 @@ class SurveyAdmin
 
             echo '<ul class="secondNavigation">';
 
-            #((($tab == 'url' || ($row['email'] != 1 && !$tab && $get!='email')) && ($get != 'invitations'))
-            echo '<li>';
-            echo '<a class="no-img side-left' . ($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_VABILA . '&m=settings" title="' . $lang['srv_publication_base'] . '">';
+            echo '<li class="'.($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_VABILA . '&m=settings" title="' . $lang['srv_publication_base'] . '">';
             echo $lang['srv_publication_base'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
-            echo '<li>';
-            echo '<a class="no-img side' . ($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_VABILA . '&m=url" title="' . $lang['srv_publication_url'] . '">';
+
+            echo '<li class="'.($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_VABILA . '&m=url" title="' . $lang['srv_publication_url'] . '">';
             echo $lang['srv_publication_url'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
-            echo '<li>';
-            echo '<a class="no-img side-right' . ($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_INVITATIONS . '" title="' . $lang['srv_inv_nav_invitations'] . '">';
+
+            echo '<li class="'.($_GET['a'] == A_INVITATIONS && $_GET['m'] != 'view_archive' ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_INVITATIONS . '" title="' . $lang['srv_inv_nav_invitations'] . '">';
             echo $lang['srv_inv_nav_invitations'] . '</a>';
             echo '</li>';
 
             echo '</ul>';
 
-            echo '<ul class="secondNavigationArchive">';
+
             # link arhivi
-            echo '<li>';
-            echo '<a class="' . ($get == A_ARHIVI || $get == A_TRACKING || $_GET['m'] == 'view_archive' ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=invitations&m=view_archive" title="' . $lang['srv_arhivi'] . '">';
-            //echo $lang['srv_arhivi'];
-            echo /*'<span class="sprites archive"></span>' .*/ $lang['srv_analiza_arhiv'];
+            echo '<ul class="secondNavigationArchive">';
+            
+            echo '<li class="'.($get == A_ARHIVI || $get == A_TRACKING || $_GET['m'] == 'view_archive' ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=invitations&m=view_archive" title="' . $lang['srv_arhivi'] . '">';
+            echo $lang['srv_analiza_arhiv'];
             echo '</a>';
             echo '</li>';
-            echo '</ul>';
 
+            echo '</ul>';
         }
         # podzavihek: analize
         if ($this->first_action == NAVI_ANALYSIS) {
@@ -1650,104 +1578,89 @@ class SurveyAdmin
 
             # ZDRUŽIMO STATISTIKE
             # osnovne
-            echo '<li>';
-            echo '<a class="no-img side-left' . ($_GET['m'] == M_ANALYSIS_SUMMARY
-                || $_GET['m'] == M_ANALYSIS_FREQUENCY
-                || $_GET['m'] == M_ANALYSIS_DESCRIPTOR
-                || $_GET['m'] == M_ANALYSIS_CROSSTAB
-                || $_GET['m'] == M_ANALYSIS_MEANS
-                || $_GET['m'] == M_ANALYSIS_TTEST
-                || $_GET['m'] == M_ANALYSIS_BREAK
-                || $_GET['m'] == M_ANALYSIS_PARA
-                || $_GET['m'] == M_ANALYSIS_MULTICROSSTABS
-                || $_GET['m'] == M_ANALYSIS_MEANS_HIERARHY
-				|| $_GET['m'] == M_ANALYSIS_HEATMAP
-                    ? ' active' : '') . '"';
+            echo '<li class="'.($_GET['m'] == M_ANALYSIS_SUMMARY
+                                || $_GET['m'] == M_ANALYSIS_FREQUENCY
+                                || $_GET['m'] == M_ANALYSIS_DESCRIPTOR
+                                || $_GET['m'] == M_ANALYSIS_CROSSTAB
+                                || $_GET['m'] == M_ANALYSIS_MEANS
+                                || $_GET['m'] == M_ANALYSIS_TTEST
+                                || $_GET['m'] == M_ANALYSIS_BREAK
+                                || $_GET['m'] == M_ANALYSIS_PARA
+                                || $_GET['m'] == M_ANALYSIS_MULTICROSSTABS
+                                || $_GET['m'] == M_ANALYSIS_MEANS_HIERARHY
+                                || $_GET['m'] == M_ANALYSIS_HEATMAP
+                            ? ' active' : '').'">';
             if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) {
-                echo ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_MEANS_HIERARHY . '" title="' . $lang['srv_stat_analiza'] . '">';
-            } else {
-                echo ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_SUMMARY . '" title="' . $lang['srv_stat_analiza'] . '">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_MEANS_HIERARHY . '" title="' . $lang['srv_stat_analiza'] . '">';
+            } 
+            else {
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_SUMMARY . '" title="' . $lang['srv_stat_analiza'] . '">';
             }
             echo $lang['srv_stat_analiza'] . '</a>';
             echo '</li>';
 
 
-            echo '<li class="space"></li>';
-
-
             if (!SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) {
 
 				# zavihek GRAFI
-                echo '<li>';
-                echo '<a class="no-img ' . ($_GET['m'] == M_ANALYSIS_CHARTS ? ' active' : '') . '"'
-                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_CHARTS . '" title="' . $lang['srv_analiza_charts'] . '">';
+                echo '<li class="'.($_GET['m'] == M_ANALYSIS_CHARTS ? ' active' : '').'">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_CHARTS . '" title="' . $lang['srv_analiza_charts'] . '">';
                 echo $lang['srv_analiza_charts'] . '</a>';
                 echo '</li>';
 
-                echo '<li class="space"></li>';
-
 				// zavihek POROCILA
                 // Link na navadna porocila
                 if (SurveyCustomReport::checkEmpty($this->anketa)) {
-                    echo '<li>';
-                    echo '<a class="no-img side-right ' . ($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? ' active' : '') . '"'
-                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_LINKS . '" title="' . $lang['srv_reporti'] . '">';
+                    echo '<li class="'.($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? ' active' : '').'">';
+                    echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_LINKS . '" title="' . $lang['srv_reporti'] . '">';
                     echo $lang['srv_reporti'] . '</a>';
                     echo '</li>';
-                } // Link na porocilo po meri (ce ni prazno)
+                } 
+                // Link na porocilo po meri (ce ni prazno)
                 else {
-                    echo '<li>';
-                    echo '<a class="no-img side-right' . ($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? ' active' : '') . '"'
-                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_CREPORT . '" title="' . $lang['srv_reporti'] . '">';
+                    echo '<li class="'.($_GET['m'] == M_ANALYSIS_CREPORT || $this->second_action == NAVI_ANALYSIS_LINKS ? ' active' : '').'">';
+                    echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_CREPORT . '" title="' . $lang['srv_reporti'] . '">';
                     echo $lang['srv_reporti'] . '</a>';
                     echo '</li>';
                 }
 
                 // zavihek vizualizacija - zaenkrat samo admini
 				if ($admin_type === '0') {
-					echo '<li class="space"></li>';
 
-					echo '<li>';
-					echo '<a class="no-img ' . ($_GET['m'] == M_ANALYSIS_VIZUALIZACIJA ? ' active' : '') . '"'
-						. ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_VIZUALIZACIJA . '" title="' . $lang['srv_vizualizacija'] . '">';
+					echo '<li class="'.($_GET['m'] == M_ANALYSIS_VIZUALIZACIJA ? ' active' : '').'">';
+					echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_VIZUALIZACIJA . '" title="' . $lang['srv_vizualizacija'] . '">';
 					echo $lang['srv_vizualizacija'] . '</a>';
 					echo '</li>';
 				}
 
 				// zavihek 360 STOPINJSKA POROCILA
 				if (SurveyInfo::getInstance()->checkSurveyModule('360_stopinj')) {
-					echo '<li class="space"></li>';
 
-					echo '<li>';
-					echo '<a class="no-img ' . ($_GET['m'] == M_ANALYSIS_360 ? ' active' : '') . '"'
-						. ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_360 . '" title="' . $lang['srv_360_stopinj'] . '">';
+					echo '<li class="'.($_GET['m'] == M_ANALYSIS_360 ? ' active' : '').'">';
+					echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_360 . '" title="' . $lang['srv_360_stopinj'] . '">';
 					echo $lang['srv_360_report'] . '</a>';
 					echo '</li>';
 				}
 
 				// zavihek 360 STOPINJSKA POROCILA 1KA
 				if (SurveyInfo::getInstance()->checkSurveyModule('360_stopinj_1ka')) {
-					echo '<li class="space"></li>';
 
-					echo '<li>';
-					echo '<a class="no-img ' . ($_GET['m'] == M_ANALYSIS_360_1KA ? ' active' : '') . '"'
-						. ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_360_1KA . '" title="' . $lang['srv_360_stopinj'] . '">';
+					echo '<li class="'.($_GET['m'] == M_ANALYSIS_360_1KA ? ' active' : '').'">';
+					echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_360_1KA . '" title="' . $lang['srv_360_stopinj'] . '">';
 					echo $lang['srv_360_report'] . '</a>';
 					echo '</li>';
 				}
-
-				//$row = Cache::srv_spremenljivka($spremenljivka);
-
             }
 
             echo '</ul>';
 
-            echo '<ul class="secondNavigationArchive">';
+
             # link arhivi
-            echo '<li>';
-            echo '<a class="no-img ' . ($_GET['m'] == M_ANALYSIS_ARCHIVE ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_ARCHIVE . '" title="' . $lang['srv_analiza_arhiv'] . '">';
-            echo /*'<span class="sprites archive"></span>' .*/ $lang['srv_analiza_arhiv'];
+            echo '<ul class="secondNavigationArchive">';
+
+            echo '<li class="'.($_GET['m'] == M_ANALYSIS_ARCHIVE ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ANALYSIS . '&amp;m=' . M_ANALYSIS_ARCHIVE . '" title="' . $lang['srv_analiza_arhiv'] . '">';
+            echo $lang['srv_analiza_arhiv'];
             echo '</a>';
             echo '</li>';
 
@@ -1761,50 +1674,44 @@ class SurveyAdmin
                 echo '<ul class="secondNavigation">';
 
                 // podatki
-                echo '<li>';
-                echo '<a class="no-img side-left' . ((($_GET['m'] == 'view' || $_GET['m'] == '' || $_GET['m'] == M_COLLECT_DATA_QUICKEDIT || $_GET['m'] == M_COLLECT_DATA_VARIABLE_VIEW || $_GET['m'] == M_COLLECT_DATA_QUICKEDIT) && $_GET['a'] != A_COLLECT_DATA_EXPORT) ? ' active' : '') . '"'
-                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '" title="' . $lang['srv_link_data_browse'] . '">';
+                echo '<li class="'.((($_GET['m'] == 'view' || $_GET['m'] == '' || $_GET['m'] == M_COLLECT_DATA_QUICKEDIT || $_GET['m'] == M_COLLECT_DATA_VARIABLE_VIEW || $_GET['m'] == M_COLLECT_DATA_QUICKEDIT) && $_GET['a'] != A_COLLECT_DATA_EXPORT) ? ' active' : '').'">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '" title="' . $lang['srv_link_data_browse'] . '">';
                 echo $lang['srv_link_data_browse'] . '</a>';
                 echo '</li>';
-                echo '<li class="space"></li>';
 
                 // izracuni
-                echo '<li>';
-                echo '<a class="no-img' . ($_GET['m'] == M_COLLECT_DATA_CALCULATION || $_GET['m'] == M_COLLECT_DATA_CODING || $_GET['m'] == 'coding_auto' || $_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' active' : '') . '"'
-                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '&amp;m=calculation" title="' . $lang['srv_data_navigation_calculate'] . '">';
+                echo '<li class="'.($_GET['m'] == M_COLLECT_DATA_CALCULATION || $_GET['m'] == M_COLLECT_DATA_CODING || $_GET['m'] == 'coding_auto' || $_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' active' : '').'">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '&amp;m=calculation" title="' . $lang['srv_data_navigation_calculate'] . '">';
                 echo $lang['srv_data_navigation_calculate'] . '</a>';
                 echo '</li>';
-                echo '<li class="space"></li>';
 
                 // uvoz
-                echo '<li>';
-                echo '<a class="no-img' . ($_GET['m'] == 'append' || $_GET['m'] == 'merge' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' active' : '') . '"'
-                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '&amp;m=append" title="' . $lang['srv_data_navigation_import'] . '">';
+                echo '<li class="'.($_GET['m'] == 'append' || $_GET['m'] == 'merge' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' active' : '').'">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA . '&amp;m=append" title="' . $lang['srv_data_navigation_import'] . '">';
                 echo $lang['srv_data_navigation_import'] . '</a>';
                 echo '</li>';
-                echo '<li class="space"></li>';
 
                 $d = new Dostop();
                 # izvozi
                 if ($d->checkDostopSub('export')) {
 
-                    echo '<li>';
-                    echo '<a class="no-img side-right' . ($this->second_action == NAVI_DATA_EXPORT ? ' active' : '') . '"'
-                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA_EXPORT . '" title="' . $lang['srv_export_tab'] . '">';
+                    echo '<li class="'.($this->second_action == NAVI_DATA_EXPORT ? ' active' : '').'">';
+                    echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_COLLECT_DATA_EXPORT . '" title="' . $lang['srv_export_tab'] . '">';
                     echo $lang['srv_export_tab'] . '</a>';
                     echo '</li>';
                 }
 
                 echo '</ul>';
 
+
+                # link arhivi
                 if ($d->checkDostopSub('edit')) {
+
                     echo '<ul class="secondNavigationArchive">';
-                    # link arhivi
-                    echo '<li>';
-                    echo '<a class="no-img ' . ($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' active' : '') . '"'
-                        . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ARHIVI . '&amp;m=data" title="' . $lang['srv_arhiv_data'] . '">';
-                    //echo $lang['srv_analiza_arhiv'];
-                    echo /*'<span class="sprites archive"></span>' .*/ $lang['srv_analiza_arhiv'];
+                    
+                    echo '<li class="'.($_GET['a'] == A_ARHIVI && $_GET['m'] == 'data' ? ' active' : '').'">';
+                    echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_ARHIVI . '&amp;m=data" title="' . $lang['srv_arhiv_data'] . '">';
+                    echo $lang['srv_analiza_arhiv'];
                     echo '</a>';
                     echo '</li>';
 
@@ -1838,7 +1745,7 @@ class SurveyAdmin
                     || isset($modules['quiz'])
                     || isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_UPORABNOST . '" title="' . $lang['srv_uporabnost'] . '">' . $lang['srv_uporabnost'] . '</a></li>';
             }
             # vnos
@@ -1847,7 +1754,7 @@ class SurveyAdmin
                 $_right = (isset($modules['quiz'])
                     || isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_VNOS . '" title="' . $lang['srv_vnos'] . '">' . $lang['srv_vnos'] . '</a></li>';
             }
             #kviz
@@ -1855,7 +1762,7 @@ class SurveyAdmin
                 $_active = ($_GET['a'] == A_KVIZ) ? ' active' : '';
                 $_right = (isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_KVIZ . '" title="' . $lang['srv_kviz'] . '">' . $lang['srv_kviz'] . '</a></li>';
             }
             #volitve
@@ -1863,7 +1770,7 @@ class SurveyAdmin
                 $_active = ($_GET['a'] == A_VOTING) ? ' active' : '';
                 $_right = (isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_VOTING . '" title="' . $lang['srv_voting'] . '">' . $lang['srv_voting'] . '</a></li>';
             }
 			#napredni parapodatki
@@ -1871,20 +1778,20 @@ class SurveyAdmin
                 $_active = ($_GET['a'] == A_ADVANCED_PARADATA) ? ' active' : '';
                 $_right = (isset($modules['advanced_paradata'])
                     || isset($modules['advanced_paradata'])) ? '' : ' side-right';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_ADVANCED_PARADATA . '" title="' . $lang['srv_advanced_paradata'] . '">' . $lang['srv_advanced_paradata'] . '</a></li>';
             }
             # SN
             if (isset($modules['social_network'])) {
                 $_active = ($_GET['a'] == A_SOCIAL_NETWORK) ? ' active' : '';
                 $_right = (isset($modules['slideshow'])) ? '' : ' side-right';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '">' . $lang['srv_vrsta_survey_type_8'] . '</a></li>';
             }
             #slideshow
             if (isset($modules['slideshow'])) {
                 $_active = ($_GET['a'] == A_SLIDESHOW) ? ' active' : '';
-                echo '<li class="space"></li>';
+
                 echo '<li><a class="no-img side-right' . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_SLIDESHOW . '" title="' . $lang['srv_vrsta_survey_type_9'] . '">' . $lang['srv_vrsta_survey_type_9'] . '</a></li>';
             }
 
@@ -1910,7 +1817,6 @@ class SurveyAdmin
                 . ' href="index.php?anketa=' . $this->anketa . '&a=' . A_REPORTI . '" title="' . $lang['srv_status_osnovni'] . '">';
             echo $lang['srv_status_summary'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
 
             # parapodatki (browser, os, js...) - volitve imajo to ugasnjeno
             if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) {
@@ -1919,19 +1825,15 @@ class SurveyAdmin
                     . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PARA_GRAPH . '" title="' . $lang['srv_metapodatki'] . '">';
                 echo $lang['srv_metapodatki'] . '</a>';
                 echo '</li>';
-                echo '<li class="space"></li>';
             }
 
             # neodgovori in uporabnost enot
-            //if ($admin_type === '0') {
             # non-responses
             echo '<li>';
             echo '<a class="no-img' . ($_GET['a'] == A_NONRESPONSE_GRAPH ? ' active' : '') . '"'
                 . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_NONRESPONSE_GRAPH . '" title="' . $lang['srv_para_neodgovori'] . '">';
             echo $lang['srv_para_neodgovori'] . '</a>';
             echo '</li>';
-            echo '<li class="space"></li>';
-            //}
 
             # Gumb za novo stran napredni statusi
             echo '<li>';
@@ -1939,7 +1841,6 @@ class SurveyAdmin
                 . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">';
             echo $lang['srv_status_advanced'] . ' >></a>';
             echo '</li>';
-            echo '<li class="space"></li>';
 
             echo '</ul>';
         }
@@ -1964,6 +1865,7 @@ class SurveyAdmin
         if($hierarhija_type < 5) {
 
 			echo '<div id="secondNavigation_links">';
+            
             # Ikonce za delete, copy ....
             $d = new Dostop();
             if ($d->checkDostopAktiven()) {
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 433d1eaa7..981821a0b 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -254,16 +254,12 @@ class SurveyList {
 					echo $lang['n_users_list'].'</a>';
                     echo '</li>';
                     
-                    echo '<li class="space"></li>';
-
 					#zavihek seznam vseh uporabnikov
 					echo '<li>';
 					echo '<a class="no-img single '.($_GET['m'] == 'all' ? 'active' : '').'"'
 						 .' href="index.php?a=diagnostics&t=uporabniki&m=all" title="'.$lang['n_users_list_all'].'">';
 					echo $lang['n_users_list_all'].'</a>';
 					echo '</li>';
-
-					echo '<li class="space"></li>';
 					
 					#zavihek izbrisani uporabniki
 					echo '<li>';
@@ -271,8 +267,6 @@ class SurveyList {
 							.' href="index.php?a=diagnostics&t=uporabniki&m=izbrisani" title="'.$lang['n_deleted_users'].'">';
 						echo $lang['n_deleted_users'].'</a>';
 					echo '</li>';
-
-					echo '<li class="space"></li>';
 					
 					#zavihek odjavljeni uporabniki
 					echo '<li>';
@@ -280,8 +274,6 @@ class SurveyList {
 							.' href="index.php?a=diagnostics&t=uporabniki&m=nepotrjeni" title="'.$lang['n_unconfirmed_users'].'">';
 						echo $lang['n_unconfirmed_users'].'</a>';
 					echo '</li>';
-
-					echo '<li class="space"></li>';
 					
 					#zavihek nepotrjenih uporabnikov
 					echo '<li>';
@@ -289,8 +281,6 @@ class SurveyList {
 							.' href="index.php?a=diagnostics&t=uporabniki&m=odjavljeni" title="'.$lang['n_unsigned_users'].'">';
 						echo $lang['n_unsigned_users'].'</a>';
 					echo '</li>';
-
-					echo '<li class="space"></li>';
 					
 					#zavihek sa modul
 					echo '<li>';
@@ -327,40 +317,30 @@ class SurveyList {
 					echo $lang['srv_ankete'].'</a>';
 					echo '</li>';
 					
-					echo '<li class="space"></li>';
-					
 					echo '<li>';
 					echo '<a class="no-img'.(($_GET['t']=='time_span_daily') ? ' active' : '').'"'
 						 .' href="index.php?a=diagnostics&t=time_span_daily" title="'.$lang['srv_weekly_diagnostics'].'">';
 					echo $lang['srv_weekly_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li class="space"></li>';
-					
 					echo '<li>';
 					echo '<a class="no-img'.(($_GET['t']=='time_span_monthly') ? ' active' : '').'"'
 						 .' href="index.php?a=diagnostics&t=time_span_monthly" title="'.$lang['srv_monthly_diagnostics'].'">';
 					echo $lang['srv_monthly_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li class="space"></li>';
-					
 					echo '<li>';
 					echo '<a class="no-img'.(($_GET['t']=='time_span_yearly') ? ' active' : '').'"'
 						 .' href="index.php?a=diagnostics&t=time_span_yearly" title="'.$lang['srv_yearly_diagnostics'].'">';
 					echo $lang['srv_yearly_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li class="space"></li>';
-					
 					echo '<li>';
 					echo '<a class="no-img side-right'.(($_GET['t']=='time_span') ? ' active' : '').'"'
 						 .' href="index.php?a=diagnostics&t=time_span&uvoz=0&ustrezni=1&delnoustrezni=1&neustrezni=0" title="'.$lang['srv_all_diagnostics'].'">';
 					echo $lang['srv_all_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li class="space"></li>';
-					
 					echo '<li>';
 					echo '<a class="no-img side-right'.(($_GET['t']=='paradata') ? ' active' : '').'"'
 						 .' href="index.php?a=diagnostics&t=paradata" title="'.$lang['srv_metapodatki'].'">';
@@ -383,7 +363,6 @@ class SurveyList {
 				 .' href="index.php?a=knjiznica" title="'.$lang['srv_javna_knjiznica'].'">';
 			echo $lang['srv_javna_knjiznica'].'</a>';
 			echo '</li>';
-			echo '<li class="space"></li>';
 			
 			# Zavihek moja knjižnica	
 			echo '<li>';
@@ -408,42 +387,42 @@ class SurveyList {
 					 .' href="index.php?a=nastavitve&amp;m=system" title="'.$lang['srv_settingsSystem'].'">';
 				echo $lang['srv_settingsSystem'].'</a>';
 				echo '</li>';
-				echo '<li class="space"></li>';
+
 				# Zavihek ocenjevanje trajanja	
 				echo '<li>';
 				echo '<a class="no-img'.($tab=='predvidenicasi' ? ' active' : '').'"'
 					 .' href="index.php?a=nastavitve&amp;m=predvidenicasi" title="'.$lang['srv_testiranje_predvidenicas'].'">';
 				echo $lang['srv_testiranje_predvidenicas'].'</a>';
 				echo '</li>';
-				echo '<li class="space"></li>';
+
 				# Zavihek mape	
 				echo '<li>';
 				echo '<a class="no-img'.($tab=='collectData' ? ' active' : '').'"'
 					 .' href="index.php?a=nastavitve&amp;m=collectData" title="'.$lang['srv_collectData'].'">';
 				echo $lang['srv_collectData'].'</a>';
 				echo '</li>';
-				echo '<li class="space"></li>';
+
 				# Zavihek lep url
 				echo '<li>';
 				echo '<a class="no-img'.($tab=='nice_links' ? ' active' : '').'"'
 					 .' href="index.php?a=nastavitve&amp;m=nice_links" title="'.$lang['srv_nice_url'].'">';
 				echo $lang['srv_nice_url'].'</a>';
 				echo '</li>';
-				echo '<li class="space"></li>';
+
 				# ankete z administrativnim dostopom
 				echo '<li>';
 				echo '<a class="no-img'.($tab=='anketa_admin' ? ' active' : '').'"'
 					 .' href="index.php?a=nastavitve&amp;m=anketa_admin" title="'.$lang['srv_anketa_admin'].'">';
 				echo $lang['srv_anketa_admin'].'</a>';
 				echo '</li>';
-				echo '<li class="space"></li>';
+
 				# zbrisane ankete
 				echo '<li>';
 				echo '<a class="no-img'.($tab=='anketa_deleted' ? ' active' : '').'"'
 					 .' href="index.php?a=nastavitve&amp;m=anketa_deleted" title="'.$lang['srv_anketa_deleted'].'">';
 				echo $lang['srv_anketa_deleted'].'</a>';
 				echo '</li>';
-				echo '<li class="space"></li>';
+
 				# Zbrisani podatki
 				echo '<li>';
 				echo '<a class="no-img'.($tab=='data_deleted' ? ' active' : '').'"'
@@ -451,19 +430,13 @@ class SurveyList {
 				echo $lang['srv_data_deleted'].'</a>';
 				echo '</li>';
 			}
-			
-			// nastavitve uporabnika
-			if($admin_type == 0)
-				echo '<li class="space"></li>';
-			
+						
 			echo '<li>';
 			echo '<a class="no-img side-right'.($tab=='global_user_settings' ? ' active' : '').'"'
 				 .' href="index.php?a=nastavitve&amp;m=global_user_settings" title="'.$lang['srv_user_settings'].'">';
 			echo $lang['srv_user_settings'].'</a>';
 			echo '</li>';
-			
-			echo '<li class="space"></li>';
-			
+						
 			// Moj profil
             echo '<li>';
             echo '<a class="no-img side-right' . ($tab == 'global_user_myProfile' ? ' active' : '') . '"' . ' href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
@@ -484,10 +457,7 @@ class SurveyList {
 			echo $lang['srv_notifications_recieved'].'</a>';
 			echo '</li>';
 			
-			if ($admin_type == '0') {
-				
-				echo '<li class="space"></li>';
-				
+			if ($admin_type == '0') {				
 				# poslana obvestila
 				echo '<li>';
 				echo '<a class="no-img side-left'.($_GET['t']=='sent' ? ' active' : '').'"'
@@ -509,8 +479,6 @@ class SurveyList {
 				 .' href="index.php?a=narocila" title="'.$lang['srv_narocila_my'].'">';
 			echo $lang['srv_narocila_my'].'</a>';
             echo '</li>';
-
-            echo '<li class="space"></li>';
             
             # placila - samo admini
             if ($admin_type == '0') {
@@ -535,16 +503,12 @@ class SurveyList {
 			echo $lang['srv_gdpr_user_settings'].'</a>';
 			echo '</li>';
 			
-			echo '<li class="space"></li>';
-			
 			// Seznam anket
 			echo '<li>';
 			echo '<a class="no-img side-right'.($_GET['m']=='gdpr_survey_list' ? ' active' : '').'"'
 				 .' href="index.php?a=gdpr&amp;m=gdpr_survey_list" title="'.$lang['srv_gdpr_survey_list'].'">';
 			echo $lang['srv_gdpr_survey_list'].'</a>';
 			echo '</li>';
-			
-            echo '<li class="space"></li>';
             
             // DPA
 			echo '<li>';
@@ -553,8 +517,6 @@ class SurveyList {
 			echo $lang['srv_gdpr_dpa'].'</a>';
 			echo '</li>';
 			
-			echo '<li class="space"></li>';
-			
 			// Zahteve za izbris
 			echo '<li>';
 			$request_counter = GDPR::countUserUnfinishedRequests();
@@ -565,10 +527,7 @@ class SurveyList {
 			echo '</li>';
 			
 			// Vse zahteve za izbris - samo ADMINI
-			if($admin_type == '0'){
-				
-				echo '<li class="space"></li>';
-				
+			if($admin_type == '0'){			
 				echo '<li>';
 				echo '<a class="no-img side-right'.($_GET['m']=='gdpr_requests_all' ? ' active' : '').'"'
 					 .' href="index.php?a=gdpr&amp;m=gdpr_requests_all" title="'.$lang['srv_gdpr_requests_all'].'">';
@@ -590,8 +549,7 @@ class SurveyList {
 			
 			
 			if ($admin_type == 0) {		
-				echo '<li class="space"></li>';
-				
+			
 				# Uvozi - samo admini
 				echo '<li>';
 				echo '<a class="no-img side-left'.($_GET['t']=='import' ? ' active' : '').'"'
@@ -599,16 +557,12 @@ class SurveyList {
 				echo 'Uvozi</a>';
 				echo '</li>';
 				
-				echo '<li class="space"></li>';
-				
 				# Testiranje - samo admini
 				echo '<li>';
 				echo '<a class="no-img side-left'.($_GET['t']=='test' ? ' active' : '').'" href="index.php?a=ul_evalvation&amp;t=test" title="Testiranje">';
 				echo 'Testiranje</a>';
 				echo '</li>';
-				
-				echo '<li class="space"></li>';
-				
+								
 				# GC - samo admini
 				echo '<li>';
 				echo '<a class="no-img side-left'.($_GET['t']=='gc' ? ' active' : '').'" href="index.php?a=ul_evalvation&amp;t=gc" title="GC">';
@@ -691,8 +645,8 @@ class SurveyList {
 		echo '<div id="firstNavigation" class="frontpage">';
 		
 							
-		echo '<ol class="smaller left-side left-1ka">';
-		echo '<li class="moja1ka">';
+		echo '<ol class="navigation_buttons_list">';
+		echo '<li class="moja1ka active_'.$css_1.'">';
 		echo '<a  href="index.php?a=pregledovanje" title="' . $lang['srv_pregledovanje'] . '">';
 		echo '<div class="smaller-singlebutton-'.$css_1.'">'. $lang['srv_pregledovanje'] . '</div>';
 		echo '</a>';
@@ -700,9 +654,7 @@ class SurveyList {
 
 		$SLCountPhoneSurvey = $this->countPhoneSurveys();
 		if ($SLCountPhoneSurvey > 0 && $admin_type != '0') {
-			#echo '<li class="spaceLarge">&nbsp;</li>';
-			echo '<li class="spaceBig">&nbsp;</li>';
-			echo '<li>';
+			echo '<li class="active_'.$css_6.'">';
 			echo '<a  href="index.php?a=phoneSurveys" title="' . $lang['srv_telephone_surveys'] . '">';
 			echo '<div class="smaller-singlebutton-'.$css_6.'">' . $lang['srv_telephone_surveys'] . '</div>';
 			echo '</a>';
@@ -712,9 +664,7 @@ class SurveyList {
 		
 		$SLCount = $this->countSurveys();
 		if ($SLCount > 0 && $admin_type <= 1) {
-			#echo '<li class="spaceLarge">&nbsp;</li>';
-			echo '<li class="spaceBig">&nbsp;</li>';
-			echo '<li>';
+			echo '<li class="active_'.$css_2.'">';
 			echo '<a  href="index.php?a=diagnostics" title="' . $lang['srv_diagnostics'] . '">';
 			echo '<div class="smaller-singlebutton-'.$css_2.'">'. $lang['srv_diagnostics'] . '</div>';
 			echo '</a>';
@@ -724,47 +674,30 @@ class SurveyList {
 		# uporabniki
 		if ($admin_type <= 1 /*or true*/) {
 			# ni smiselno da ostali uporabniki vidijo zavihek, ker so tako prikazane samo njihove ankete
-			echo '<li class="spaceBig">&nbsp;</li>';
-			echo '<li>';
+			echo '<li class="active_'.$css_5.'">';
 			echo '<a  href="index.php?a=diagnostics&t=uporabniki" title="' . $lang['hour_users'] . '">';
 			echo '<div class="smaller-singlebutton-'.$css_5.'">'. $lang['hour_users'] . '</div>';
 			echo '</a>';
 			echo '</li>';
 		}
-		echo '<li class="spaceBig">&nbsp;</li>';
-		echo '<li>';
+
+        // Knjiznica
+		echo '<li class="active_'.$css_3.'">';
 		echo '<a  href="index.php?a=knjiznica" title="' . $lang['srv_library'] . '">';
 		echo '<div class="smaller-singlebutton-'.$css_3.'">'. $lang['srv_library'] . '</div>';
 		echo '</a>';
 		echo '</li>';
 		
-		# Nastavitve
-		//if ($admin_type == 0) {	
-			echo '<li class="spaceBig">&nbsp;</li>';
-		
-			echo '<li>';
-			echo '<a href="index.php?a=nastavitve'.($admin_type != 0 ? '&m=global_user_settings' : '').'" title="' . $lang['settings'] . '">';
-			echo '<div class="smaller-singlebutton-'.$css_4.'">' . $lang['settings'] . '</div>';
-			echo '</a>';
-			echo '</li>';
-		//}	
-			
-		# Streznik	
-		if ($admin_type == 0 && false) {	
-			echo '<li class="spaceBig">&nbsp;</li>';
-		
-			echo '<li>';
-			echo '<a  href="http://www.1ka.si/SAR/" title="'.$lang['srv_sar'].'" target="_blank">';
-			echo '<div class="smaller-singlebutton-off">'/*<span class="sprites streznik_off"></span>'*/.$lang['srv_sar'].'</div>';
-			echo '</a>';
-			echo '</li>';
-		}
+		// Nastavitve
+        echo '<li class="active_'.$css_4.'">';
+        echo '<a href="index.php?a=nastavitve'.($admin_type != 0 ? '&m=global_user_settings' : '').'" title="' . $lang['settings'] . '">';
+        echo '<div class="smaller-singlebutton-'.$css_4.'">' . $lang['settings'] . '</div>';
+        echo '</a>';
+        echo '</li>';			
 		
 		# Obvestila - zaenkrat samo admin	
 		if ($admin_type == 0) {	
-			echo '<li class="spaceBig">&nbsp;</li>';
-		
-			echo '<li>';
+			echo '<li class="active_'.$css_7.'">';
 			echo '<a href="index.php?a=obvestila'.($admin_type == 0 ? '&t=sent' : '').'" title="' . $lang['srv_notifications'] . '">';
 			echo '<div class="smaller-singlebutton-'.$css_7.'">'.$lang['srv_notifications'].'</div>';
 			echo '</a>';
@@ -773,9 +706,7 @@ class SurveyList {
         
         # Narocila - samo ce imamo vklopljene pakete
         if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
-            echo '<li class="spaceBig">&nbsp;</li>';
-            
-            echo '<li>';
+            echo '<li class="active_'.$css_10.'">';
             echo '<a href="index.php?a=narocila" title="' . $lang['srv_narocila'] . '">';
             echo '<div class="smaller-singlebutton-'.$css_10.'">'.$lang['srv_narocila'].'</div>';
             echo '</a>';
@@ -783,9 +714,7 @@ class SurveyList {
         }
 		
 		# GDPR
-		echo '<li class="spaceBig">&nbsp;</li>';
-		
-		echo '<li>';
+		echo '<li class="active_'.$css_9.'">';
 		$request_counter = GDPR::countUserUnfinishedRequests();
 		$request_counter_text = (true) ? ' <sup class="red" style="vertical-align: baseline; position: relative; top: -0.4em;">('.$request_counter.')</sup>' : '';
 		echo '<a href="index.php?a=gdpr'.($request_counter > 0 ? '&m=gdpr_requests' : '').'" title="' . $lang['srv_gdpr_settings'] . '">';
@@ -795,9 +724,7 @@ class SurveyList {
 		
 		# UL evalvacija razne nastavitve, uvozi, izvozi - samo na anketa.uni-lj.si/student (zaenkrat samo admin)
 		if (Common::checkModule('evalvacija') == '1' && $admin_type == 0) {	
-			echo '<li class="spaceBig">&nbsp;</li>';
-		
-			echo '<li>';
+			echo '<li class="active_'.$css_8.'">';
 			echo '<a href="index.php?a=ul_evalvation" title="UL evalvacije">';
 			echo '<div class="smaller-singlebutton-'.$css_8.'">UL evalvacije</div>';
 			echo '</a>';
@@ -833,7 +760,7 @@ class SurveyList {
 			break;
 		}
 		
-		echo '<ol class="smaller left-side help-1ka" >';
+		echo '<ol class="help-1ka">';
 		echo '  <li>';
 		echo '      <a href="'.$help_url.'" title="'.$lang['srv_settings_help'].'" target="_blank" >';
 		echo '          <div class="smaller-singlebutton-off">'.$lang['srv_settings_help'].'</div>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index b57ee32ae..50e974039 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5454,28 +5454,35 @@ header #surveyNavigation {
 header #surveyNavigation #firstNavigation {
   display: flex;
   height: 50px;
-  width: 100%;
   padding-top: 10px;
+  margin-left: 32px;
   font-size: 16px;
   font-weight: 400;
   text-align: center;
 }
-header #surveyNavigation #firstNavigation #mojeAnketeLink a {
-  color: #FFFFFF;
-  text-decoration: none;
-}
 header #surveyNavigation #firstNavigation ol {
   display: flex;
+  padding: 0;
+  margin: 0;
 }
 header #surveyNavigation #firstNavigation ol li {
   list-style-image: none;
   list-style-position: outside;
   list-style-type: none;
 }
-header #surveyNavigation #firstNavigation ol li a {
+header #surveyNavigation #firstNavigation ol.navigation_buttons_list li {
+  padding: 14px 32px;
+}
+header #surveyNavigation #firstNavigation ol.navigation_buttons_list li a {
   color: #FFFFFF;
   text-decoration: none;
 }
+header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_on {
+  background-color: #FFFFFF;
+}
+header #surveyNavigation #firstNavigation ol.navigation_buttons_list li.active_on a {
+  color: #1E88E5;
+}
 header #quick_comments_link.newCss {
   font-size: 12px;
   margin-top: 3px !important;
@@ -5516,159 +5523,42 @@ header span.sprites.comments_orange_on {
   text-align: center;
 }
 header #secondNavigation {
-  display: block;
-  z-index: 1;
-  left: 0px;
-  right: 0px;
-  padding: 8px 20px 0 145px;
-  height: 33px;
-  border-bottom: 1px solid #1E88E5;
-  background-color: #ffffff;
+  display: flex;
+  height: 41px;
+  border-bottom: 1px solid #E5E5E5;
 }
-header ul.secondNavigation {
-  display: inline-block;
-  float: left;
-  width: auto;
-  margin-top: 1px !important;
-  margin-bottom: 0;
+header #secondNavigation ul.secondNavigation,
+header #secondNavigation ul.secondNavigationArchive {
+  display: flex;
+  align-items: center;
+  margin: 0 0 0 32px;
+  padding: 0;
 }
-header .secondNavigation {
-  display: inline-block;
+header #secondNavigation ul.secondNavigation li,
+header #secondNavigation ul.secondNavigationArchive li {
   list-style-image: none;
   list-style-position: outside;
   list-style-type: none;
-  padding: 0px;
-  width: 100%;
+  height: 41px;
+  border-bottom: 1px #E5E5E5 solid;
 }
-header .secondNavigation li {
-  display: list-item;
-  float: left;
-  padding: 0px;
-  margin: 0px;
+header #secondNavigation ul.secondNavigation li a,
+header #secondNavigation ul.secondNavigationArchive li a {
+  padding: 12px 32px;
+  line-height: 41px;
+  font-size: 15px;
+  color: #808080;
+  text-decoration: none;
 }
-header .secondNavigation .blank {
-  height: 12px;
-  width: 6px;
+header #secondNavigation ul.secondNavigation li.active, header #secondNavigation ul.secondNavigation li:hover,
+header #secondNavigation ul.secondNavigationArchive li.active,
+header #secondNavigation ul.secondNavigationArchive li:hover {
+  border-bottom: 1px #1E88E5 solid;
 }
-header .secondNavigation .no-img {
-  padding: 0px 12px !important;
-  background-image: none !important;
-}
-header .secondNavigation a {
-  display: block;
-  line-height: 30px;
-  font-size: 14px;
-  color: #E5E5E5;
-}
-header .secondNavigation a:hover {
-  border-bottom: 2px solid #FFC700;
-}
-header .secondNavigation a.active {
-  color: #FFC700;
-  background-color: inherit;
-  border-bottom: 2px solid #FFC700;
-}
-header .secondNavigation .side-left {
-  padding-left: 10px;
-}
-header .secondNavigation .side-right {
-  padding-right: 12px;
-}
-header .secondNavigation .space {
-  width: 20px;
-  height: 19px;
-  padding: 0px;
-}
-header .secondNavigation .single {
-  padding: 0px 12px 0px 24px¸;
-}
-header .secondNavigation .single:hover {
-  text-shadow: 0px 1px 0px #fff;
-}
-header .secondNavigation .single:active {
-  color: #E5E5E5;
-}
-header #secondNavigation.library {
-  padding-left: 35px;
-}
-header #secondNavigation.library a {
-  font-size: 14px;
-}
-header #secondNavigation.library ul.secondNavigation .space {
-  width: 25px;
-}
-header #secondNavigation_links {
-  position: relative;
-  float: right;
-  width: auto;
-  margin-top: -7px;
-  line-height: 38px;
-  z-index: 2;
-  text-align: right;
-}
-header #secondNavigation_links #hover_export {
-  display: none;
-  position: absolute;
-  z-index: 99999;
-  right: 10px;
-  top: 39px;
-  padding: 5px 0 5px 13px;
-  width: 180px;
-  text-align: left;
-  line-height: normal;
-  background-color: #ffffff;
-  border: 1px #1E88E5 solid;
-  -webkit-box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.4);
-  box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.4);
-  -moz-box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.4);
-}
-header #secondNavigation_links #hover_export a {
-  display: block;
-  padding: 6px 0;
-  color: #E5E5E5;
-  font-size: 14px;
-  transition: 0.2s;
-}
-header #secondNavigation_links #hover_export a:hover {
-  color: #FFC700;
-}
-header #secondNavigation_links #hover_export span.hover_export_icon {
-  display: inline-block;
-  width: 40px;
-}
-header ul.secondNavigationArchive {
-  display: inline-block;
-  float: left;
-  width: auto;
-  padding: 0px;
-  margin: 0 0 0 10px !important;
-  padding-left: 23px;
-  padding-top: 0px;
-  font-size: 14px;
-  list-style-image: none;
-  list-style-position: outside;
-  list-style-type: none;
-  border-left: 1px dotted #1E88E5;
-}
-header ul.secondNavigationArchive li {
-  display: list-item;
-  padding: 0 12px;
-  float: left;
-  margin: 0px;
-  transition: 0.2s;
-}
-header ul.secondNavigationArchive li a {
-  color: #E5E5E5;
-  line-height: 31px;
-}
-header ul.secondNavigationArchive li a.active {
-  color: #FFC700;
-}
-header ul.secondNavigationArchive li:hover {
-  border-bottom: 2px solid #FFC700;
-}
-header ul.secondNavigationArchive li.aactive {
-  border-bottom: 2px solid #FFC700;
+header #secondNavigation ul.secondNavigation li.active a, header #secondNavigation ul.secondNavigation li:hover a,
+header #secondNavigation ul.secondNavigationArchive li.active a,
+header #secondNavigation ul.secondNavigationArchive li:hover a {
+  color: #1E88E5;
 }
 header div.breadcrumbs {
   display: none;
diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss
index b57526fab..5e6b68ea0 100644
--- a/resources/sass/admin_new/basic/colors.scss
+++ b/resources/sass/admin_new/basic/colors.scss
@@ -11,6 +11,7 @@ $black: #333333;
 $white: #FFFFFF;
 
 $very-dark-gray: #777777;
+$very-dark-gray2: #808080;
 $dark-gray: #C4C4C4;
 $gray: #E5E5E5;
 $light-gray: #F8F8F8;
diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss
index ca9f272f0..9649fc708 100644
--- a/resources/sass/admin_new/components/header/navigation.scss
+++ b/resources/sass/admin_new/components/header/navigation.scss
@@ -15,35 +15,46 @@ header{
             display: flex;
 
             height: 50px;
-            width: 100%;
 
             padding-top: 10px;
+            margin-left: 32px;
             
             font-size: 16px;
             font-weight: 400;
             text-align: center;
             
-            #mojeAnketeLink {
-                a {
-                    color: $white;
-                    text-decoration: none;
-                }
-            }
-
-            ol {
+            ol{
                 display: flex;
-                
-                li {        
+                padding: 0;
+                margin: 0;
+
+                li{
                     list-style-image: none;
                     list-style-position: outside;
                     list-style-type: none;
+                }
+
+                &.navigation_buttons_list li{
+                    padding: 14px 32px;
                     
                     a {
                         color: $white;
                         text-decoration: none;
                     }
+
+                    &.active_on{
+                        background-color: $white;
+                        
+                        a {
+                            color: $blue;
+                        }
+                    }     
+                    
+                    #mojeAnketeLink {
+
+                    }
                 }
-            }
+            }  
         }
     }
 
@@ -93,180 +104,53 @@ header{
 
 
     #secondNavigation {
-        display: block;
-        z-index: 1;
-        left: 0px;
-        right: 0px;
-        padding: 8px 20px 0 145px;
-        height: 33px;
-        border-bottom: 1px solid $blue;
-        background-color: $second_navigation_background;
-    }
+        display: flex;
 
-    ul.secondNavigation {
-        display: inline-block;
-        float: left;
-        width: auto;
-        margin-top: 1px !important;
-        margin-bottom: 0;
-    }
+        height: 41px;
 
-    .secondNavigation {
-        display: inline-block;
-        list-style-image: none;
-        list-style-position: outside;
-        list-style-type: none;
-        padding: 0px;
-        width: 100%;
-        li {
-            display: list-item;
-            float: left;
-            padding: 0px;
-            margin: 0px;
-        }
-        .blank {
-            height: 12px;
-            width: 6px;
-        }
-        .no-img {
-            padding: 0px 12px !important;
-            background-image: none !important;
-        }
-        a {
-            display: block;
-            line-height: 30px;
-            font-size: 14px;
-            color: $second_navigation_text;
-                    
-            &:hover {
-                border-bottom: 2px solid $yellow;
-            }
-        }
-        a.active {
-            color: $yellow;
-            background-color: inherit;
-            border-bottom: 2px solid $yellow;
-        }
-        .side-left {
-            padding-left: 10px;
-        }
-        .side-right {
-            padding-right: 12px;
-        }
-        .space {
-            width: 20px;
-            height: 19px;
-            padding: 0px;
-        }
-        .single {
-            padding: 0px 12px 0px 24px¸;
-            &:hover {
-                text-shadow: 0px 1px 0px #fff;
-            }
-            &:active {
-                color: $gray;
-            }
-        }
-    }
+        border-bottom: 1px solid $gray;
 
-    #secondNavigation.library {
-        padding-left: 35px;
-        a {
-            font-size: 14px;
-        }
-        ul.secondNavigation {
-            .space {
-                width: 25px;
-            }
-        }
-    }
+        ul.secondNavigation,
+        ul.secondNavigationArchive{
+            display: flex;
+            align-items: center;
 
-    #secondNavigation_links {
-        position: relative;
-        float: right;
-        width: auto;
-        margin-top: -7px;
-        line-height: 38px;
-        z-index: 2;
-        text-align: right;
-        #hover_export {
-            display: none;
-            position: absolute;
-            z-index: 99999;
-            right: 10px;
-            top: 39px;
-            padding: 5px 0 5px 13px;
-            width: 180px;
-            text-align: left;
-            line-height: normal;
-            background-color: $second_navigation_background;
-            border: 1px $blue solid;
-            -webkit-box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4);
-            box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4);
-            -moz-box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4);
-            a {
-                display: block;
-                padding: 6px 0;
-                color: $export_dropdown_text;
-                font-size: 14px;
-                
-                transition: 0.2s;
-    
-                &:hover {
-                    color: $yellow;
+            margin: 0 0 0 32px;
+            padding: 0;
+
+            li{
+                list-style-image: none;
+                list-style-position: outside;
+                list-style-type: none;
+
+                height: 41px;
+
+                border-bottom: 1px $gray solid;
+
+                a {
+                    padding: 12px 32px;
+
+                    line-height: 41px;
+                    font-size: 15px;
+                    color: $very-dark-gray2;
+                    text-decoration: none;
+                }
+
+                &.active,
+                &:hover{
+                    border-bottom: 1px $blue solid;
+
+                    a{
+                        color: $blue;
+                    }
                 }
             }
-            span.hover_export_icon {
-                display: inline-block;
-                width: 40px;
-            }
         }
     }
 
-    ul.secondNavigationArchive {
-        display: inline-block;
-        float: left;
-        width: auto;
-        padding: 0px;
-        margin: 0 0 0 10px !important;
-        padding-left: 23px;
-        padding-top: 0px;
-        
-        font-size: 14px;
-        list-style-image: none;
-        list-style-position: outside;
-        list-style-type: none;
-        
-        border-left: 1px dotted $blue;
-        
-        li {
-            display: list-item;
-            padding: 0 12px;
-            float: left;
-            margin: 0px;
-            
-            transition: 0.2s;
     
-            a {
-                color: $second_navigation_text;
-                line-height: 31px;
-            }
-            a.active {
-                color: $yellow;
-            }
-            &:hover {
-                    border-bottom: 2px solid $yellow;
-            }
-        }
-        li.aactive{
-                border-bottom: 2px solid $yellow;
-        }
-    }
-    
-
     // skrijemo breadcrumbs na desktopu
     div.breadcrumbs {
         display: none;
     }
-
 }