diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index a94f08ea9..7dfc9cce5 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -417,29 +417,45 @@ class SurveyAdminAjax {
 			
 			echo '<h2>'.$lang['srv_ime'].'</h2>';
 			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_novaanketa_polnoime'].':</div>';
-			echo '<div class="floatLeft" >';
-			echo '<input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" value="'.$naslov.'" class="full" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"  onfocus="if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" />';
-			echo '<span id="novaanketa_naslov_1_chars" class="spaceLeft">'.mb_strlen($naslov, 'UTF-8').'/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
-			echo '<br class="clr"/><i class="gray small">'.$lang['srv_interno_ime'].'</i>';
-			echo '</div>';
+
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_novaanketa_polnoime'].':</div>';
+			echo '  <div class="setting_line">';
+			echo '      <input type="text" id="novaanketa_naslov_1" name="novaanketa_naslov_1" value="'.$naslov.'" class="medium" maxlength="'.ANKETA_NASLOV_MAXLENGTH.'"  onfocus="if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" />';
+			echo '      <span id="novaanketa_naslov_1_chars" class="counter">'.mb_strlen($naslov, 'UTF-8').'/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
+			echo '  </div>';
+			echo '  <div class="opomba_line">';
+			echo        $lang['srv_interno_ime'];
+			echo '  </div>';
+
+            echo '</div>';
 			
-			echo '<br class="clr"/><br class="clr"/>';
-			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_novaanketa_kratkoime'].':</div>';
-			echo '<div class="floatLeft">';
+
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_novaanketa_kratkoime'].':</div>';
+			echo '  <div class="setting_line">';
 			$name_changed = ($naslov != $akronim) ? '1' : '0';
-			echo '<input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="'.$akronim.'" class="full" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" changed="'.$name_changed.'" />';
-			echo '<span id="novaanketa_akronim_1_chars" class="spaceLeft">'.mb_strlen($akronim, 'UTF-8').'/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
-			echo '<br class="clr"/><i class="gray small">'.$lang['srv_objavljeno_ime'].'</i>';
-			echo '</div>';
-			
-			echo '<br class="clr"/><br class="clr"/>';
-			
-			echo '<div class="quick_title_edit_label taLeft floatLeft">'.$lang['srv_list_no_data_create_note'].':</div>';
-			echo '<div class="floatLeft">';
-			echo '<textarea id="novaanketa_opis_1" name="novaanketa_opis_1" class="full" rows="3">'.$row['intro_opomba'].'</textarea>';
-			echo '</div>';
+			echo '      <input type="text" id="novaanketa_akronim_1" name="novaanketa_akronim_1" value="'.$akronim.'" class="medium" maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'"  onfocus="$(this).attr(\'changed\',\'1\'); if(this.value==\''.$lang['srv_naslov'].'\') {this.value=\'\';}" changed="'.$name_changed.'" />';
+			echo '      <span id="novaanketa_akronim_1_chars" class="counter">'.mb_strlen($akronim, 'UTF-8').'/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
+			echo '  </div>';
+			echo '  <div class="opomba_line">';
+            echo        $lang['srv_objavljeno_ime'];
+			echo '  </div>';
+
+            echo '</div>';
+
+
+            echo '<div class="quick_title_setting">';
+
+			echo '  <div class="title_line">'.$lang['srv_list_no_data_create_note'].':</div>';
+			echo '  <div class="setting_line">';
+			echo '      <textarea id="novaanketa_opis_1" name="novaanketa_opis_1" class="full" rows="3">'.$row['intro_opomba'].'</textarea>';
+			echo '  </div>';
+
+            echo '</div>';
+
 			
 			echo '<script>';
 			echo "$('#novaanketa_naslov_1').keyup(function(){
@@ -473,12 +489,10 @@ class SurveyAdminAjax {
 			    ";
 			echo '</script>';
 			
-			
-	        //echo '<span class="floatleft spaceLeft" title="'.$lang['srv_settings_quick'].'"><a class="" href="#" onclick="quick_title_edit_save(\'true\'); return false;"><span>'.$lang['srv_settings_quick'].'</span></a></span>';
-           
-            echo '<div class="buttons_holder">';
-			echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_save_profile_yes'].'"><a class="ovalbutton ovalbutton_orange" href="#" onclick="quick_title_edit_save(); return false;"><span>'.$lang['srv_save_profile_yes'].'</span></a></span>';
-	        echo '<span class="buttonwrapper floatRight spaceRight" title="'.$lang['srv_cancel'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="quick_title_edit_cancel(); return false;"><span>'.$lang['srv_cancel'].'</span></a></span>';
+			           
+            echo '<div class="button_holder">';
+	        echo '  <button class="medium white-blue" title="'.$lang['srv_cancel'].'" onclick="quick_title_edit_cancel(); return false;">'.$lang['srv_cancel'].'</button>';
+			echo '  <button class="medium blue" title="'.$lang['srv_save_profile_yes'].'" onclick="quick_title_edit_save(); return false;">'.$lang['srv_save_profile_yes'].'</button>';
             echo '</div>';
             
 			echo '</div>';
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index b8a513d6a..0211672c3 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -376,8 +376,8 @@ class GDPR{
 
 			echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</p>';
 			
-			echo '<div class="table-horizontal-scroll-wrapper1" id="gdrp_requests_unresolved">';
-        	echo '<div class="table-horizontal-scroll-wrapper2">';
+			echo '<div class="table-horizontal-scroll-wrapper-outer" id="gdrp_requests_unresolved">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
 			
 			echo '<table class="gdpr_surveys requests">';
 
@@ -491,6 +491,9 @@ class GDPR{
 								ORDER BY date(r.datum) ASC");
 		if(mysqli_num_rows($sql) > 0){
 
+            echo '<div class="table-horizontal-scroll-wrapper-outer">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
 			echo '<table class="gdpr_surveys requests all">';
 
 			echo '<tr>';
@@ -564,6 +567,9 @@ class GDPR{
 			}
 
 			echo '</table>';
+
+            echo '</div>';
+            echo '</div>';
 		}
 		else{
 			echo '<p>'.$lang['srv_gdpr_requests_none'].'</p>';
@@ -588,6 +594,9 @@ class GDPR{
 			echo '	<span class="requests_table_title"><span id="requests_table_title_plus">+</span><span id="requests_table_title_minus" style="display:none;">-</span> '.$lang['srv_gdpr_requests_done'].'</span>';
 			echo '</a>';
 			
+            echo '<div class="table-horizontal-scroll-wrapper-outer">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
 			echo '<table class="gdpr_surveys requests" id="table_requests_done" style="margin-top:0; display:none;">';
 
 			echo '<tr>';
@@ -661,6 +670,9 @@ class GDPR{
 			}
 
 			echo '</table>';
+
+            echo '</div>';
+            echo '</div>';
 		}
 	}
 
@@ -1224,6 +1236,7 @@ class GDPR{
 		$request_list_done = self::getUserRequests($ank_id, $status=1);
 
 		if(count($request_list) > 0){
+
 			echo '<table class="gdpr_surveys requests">';
 
 			echo '<tr>';
@@ -1811,20 +1824,17 @@ class GDPR{
 				}
 
 				$resultX = $MA->sendMail($content, $subject);
-		   }
-		   catch (Exception $e){
-		   }			
+		    }
+		    catch (Exception $e){
+		    }			
 			
 			// Vrnemo vse ok
-        if($jezik == '2'){
-            $success_text = 'Your request for the deletion, change or insight into your personal information for a particular survey is submitted to 
-                            the author of the survey. The author of the survey must, within a month since you submitted the request, execute your 
-                            request and inform you about it. If the author fails to do so within 30 days, we will delete the survey, including your information.';
-        }else {
-            $success_text = 'Prošnja za izbris, spremembo ali vpogled do vaših osebnih podatkov iz določene ankete je posredovana avtorju ankete. 
-                            Avtor ankete mora v roku meseca dni od oddane zahteve urediti vašo zahtevo in vas o tem obvestiti. 
-                            Če v roku 30 dni avtor tega ne izvede, bomo anketo izbrisali, vključno z vašimi podatki.';
-        }
+            if($jezik == '2'){
+                $success_text = 'Your request for the deletion, change or insight into your personal information for a particular survey is submitted to the author of the survey.<br>The author of the survey must, within a month since you submitted the request, execute your request and inform you about it.<br>If the author fails to do so within 30 days, we will delete the survey, including your information.';
+            }
+            else {
+                $success_text = 'Prošnja za izbris, spremembo ali vpogled do vaših osebnih podatkov iz določene ankete je posredovana avtorju ankete.<br>Avtor ankete mora v roku meseca dni od oddane zahteve urediti vašo zahtevo in vas o tem obvestiti.<br>Če v roku 30 dni avtor tega ne izvede, bomo anketo izbrisali, vključno z vašimi podatki.';
+            }
 
 			$response = json_encode(array('success' => $success_text), true);
 		}
@@ -1985,8 +1995,7 @@ class GDPR{
 			
 			// Poslji prosnjo
 			echo '			<p>'.$lang['srv_gdpr_drupal_end'].'</p>';
-			//echo '			<input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="submit"><br />';
-			echo '			<input name="submit" value="'.$lang['srv_potrdi'].'" class="regfield" type="button" onClick="sendGDPRRequest();"><br />';
+			echo '			<input name="submit" value="'.$lang['srv_potrdi2'].'" class="regfield" type="button" onClick="sendGDPRRequest();">';
 			
 			echo '		</form>';
 		}
diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php
index 45054865f..b9c44700e 100644
--- a/admin/survey/classes/tracking/CrossRoad.php
+++ b/admin/survey/classes/tracking/CrossRoad.php
@@ -566,8 +566,10 @@ class CrossRoad {
 
                 # GDPR
                 case 'gdpr':
-                    if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requests_all')
+                    if ($_GET['m'] == 'gdpr_requests')
                         $layout_width = 'wide';  
+                    elseif ($_GET['m'] == 'gdpr_requests_all')
+                        $layout_width = 'fullwidth';  
                     else
                         $layout_width = 'narrow';  
 
diff --git a/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php b/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
index 6c64d45bc..3568d5aef 100644
--- a/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
+++ b/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php
@@ -47,10 +47,12 @@ class SurveyGeoIP{
         echo '<p class="bold">'.$lang['srv_geoip_warning'].'</p>';
 
 
-		echo '<div>';
-        echo '<div class="floatLeft">';
+		echo '<div class="geoip_holder">';
+
         
 		// Izpis tabele frekvenc
+        echo '<div class="geoip_table_holder">';
+
 		echo '<table class="geoip_table">';
 		
 		// Prva vrstica
@@ -109,7 +111,7 @@ class SurveyGeoIP{
         // Google maps on right of table
         if(count($this->countriesLocationsData)>0){
 
-            echo '<div class="floatLeft" style="margin: 15px 0px 0px 50px;">';
+            echo '<div class="geoip_map_holder">';
 
             if(count($this->countriesLocationsData) > 1)
                 $this->displayNavigationMaps();
@@ -122,6 +124,8 @@ class SurveyGeoIP{
             
             echo '<script type="text/javascript">passMapDataRaw('.json_encode($cities).');googleMapsAPIProcedura(initializeMapGeneralForIPs);</script>';
         }
+        
+
         echo '</div>';
 	}
 	
@@ -248,29 +252,9 @@ class SurveyGeoIP{
         $countries = mb_convert_encoding($this->countriesLocationsData, "UTF-8", "ISO-8859-1");
         $cities = mb_convert_encoding($this->data['all']['all']['cities'], "UTF-8", "ISO-8859-1");
 
-        echo '<div class="secondNavigation">';
-        echo '<ul class="secondNavigation">';
-
-        echo'<li>';
-        echo '<a class="no-img active" id="geoip_cities" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($cities).');\'>';
-        echo '<span class="label">' . $lang['srv_geoip_map_cities'] . '</span>';
-        echo '</a>';
-        echo'</li>';
-
-        #space
-        echo'<li class="displayNone">';
-        echo'</li>';
-
-        echo'<li>';
-        echo '<a class="no-img" id="geoip_countries" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($countries).');\'>';
-        echo '<span class="label">' . $lang['srv_geoip_map_countries'] . '</span>';
-        echo '</a>';
-        echo'</li>';
-
-        echo'</ul>';
+        echo '<div class="geoip_navigation">';
+        echo '  <a class="active" id="geoip_cities" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($cities).');\'>'.$lang['srv_geoip_map_cities'].'</a>';
+        echo '  <a id="geoip_countries" onclick=\'geoip_map_navigation_toggle(this, '.json_encode($countries).');\'>'.$lang['srv_geoip_map_countries'].'</a>';
         echo '</div>';
-
-        echo '<br class="clr" />';
-        echo '<br class="clr" />';
     }
 }
\ No newline at end of file
diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php
index 1e2342ce8..36aba06ce 100644
--- a/frontend/simple/classes/DisplayController.php
+++ b/frontend/simple/classes/DisplayController.php
@@ -475,42 +475,45 @@ class DisplayController{
                         echo '<img class="povezave_img" src="public/img/icons/icon_kako_deluje.svg" alt="kako deluje">';
                         echo '<h2>'.$lang["povezave__kako_deluje_h2"].'</h2>';
                         echo '<p> '.$lang["povezave__kako_deluje_text"].' </p>';
-                        echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo '<a id="povezave-btn"href="https://www.1ka.si/d/sl/pomoc" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo '<a id="povezave-btn"href="https://www.1ka.si/d/en/help" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                     echo '<div class= "col"> ';
                         echo '<img class="povezave_img" src="public/img/icons/icon_o_1ka.svg" alt="o 1ka">';
                         echo '<h2>'.$lang["povezave_o_1ka_h2"].'</h2>';
                         echo '<p> '.$lang["povezave_o_1ka_text"].' </p>';
-                        echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/o-1ka/splosen-opis" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/d/en/about/general-description" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                     echo '<div class= "col"> ';
                         echo '<img class="povezave_img" src="public/img/icons/icon_1ka_podpora.svg" alt="1ka podpora">';
                         echo '<h2>'.$lang["povezave_1ka_podpora_h2"].'</h2>';
                         echo '<p> '.$lang["povezave_1ka_podpora_text"].' </p>';
-                        echo ' <a id="povezave-btn" href="https://www.1ka.si/d/sl/pomoc"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/help1KA" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo ' <a id="povezave-btn" href="https://www.1ka.si/a/72864?Q1=292032&language=2" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                     echo '<div class= "col"> ';
                         echo '<img class="povezave_img" src="public/img/icons/icon_arnes_podpora.svg" alt="arnes podpora">';
                         echo '<h2>'.$lang["povezave_arnes_podpora_h2"].'</h2>';
                         echo '<p> '.$lang["povezave_arnes_podpora_text"].' </p>';
-                        echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        if($lang['id'] == '1')
+                            echo ' <a id="povezave-btn" href="https://www.arnes.si/zavod-arnes/kontakti/" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
+                        else
+                            echo ' <a id="povezave-btn" href="https://www.arnes.si/about-arnes/contact-us/" target="_blank"> '.$lang["povezave_preberi_vec"].'<img src="public/img/icons/chevron_orange.svg" alt="hero image"> </a>';
                     echo '</div>';
 
                 echo '</div>';
             echo '</div>';
-        echo '</div>';
-
-
-
-        // APP SUBTITLE
-        /*echo '<div class="app_subtitle">';
-        echo $lang['app_aai_installation'];
-        echo '</div>';*/
-
-        
+        echo '</div>';    
     }
 
     // Izris okna za login na prvi strani
diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css
index 1487371a1..9871b7fba 100644
--- a/frontend/simple/css/aai.css
+++ b/frontend/simple/css/aai.css
@@ -1,1071 +1,868 @@
-@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap');
-
+@charset "UTF-8";
+/* 
+    Dodaten css za AAI naslovnico
+*/
+@import url("https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap");
 * {
-    font-family: "Source Sans Pro","sans-serif";
-}
-
-.cookie_notice {
-    max-width: 100%;
+  font-family: "Source Sans Pro", "sans-serif";
 }
 
 body {
-    margin: auto;
-    color: #343434;
+  margin: auto;
+  color: #343434;
 }
 
+.cookie_notice {
+  max-width: 100%;
+}
+.cookie_notice .right button {
+  font-weight: 600;
+  font-size: 16px;
+  line-height: 26px;
+  height: 50px;
+  width: 160px;
+  padding: 0px;
+  color: #FFFFFF;
+  background-color: #F07D3E;
+  border: 1px solid #F07D3E;
+  border-radius: 0;
+  transition: 0.3s ease-out;
+}
+.cookie_notice .right button:hover {
+  color: #F07D3E;
+  background-color: white;
+  border: 1px solid #F07D3E;
+}
 
 #main {
-    background-color: white;
-
+  background-color: white;
 }
 #main .main_content {
-    max-width: unset;
+  max-width: unset;
 }
 
 /* nav */
-.mobile{
-    display: none;
+.mobile {
+  display: none;
 }
 
 body.landing_page #content.aai #main {
-    background-image: none;
+  background-image: none;
 }
 
-
 header {
-    height: unset;
-    padding-top: 13px;
-    padding-left: 0px;
-    padding-right: 0px;
-
-    max-width: 1160px;
-    width: 95%;
-    margin: auto;
+  height: unset;
+  padding-top: 13px;
+  padding-left: 0px;
+  padding-right: 0px;
+  max-width: 1160px;
+  width: 95%;
+  margin: auto;
 }
-
-
-
 header .nav-desktop span.menu_item {
-    margin-left: 32px;
-    text-transform: none;
+  margin-left: 32px;
+  text-transform: none;
 }
-
 header nav span.menu_item {
-    border-bottom: 0px;
+  border-bottom: 0px;
 }
-
 header .nav-desktop span.menu_item a {
-    color: #343434;
-    font-style: normal;
-    font-weight: 400;
-    font-size: 16px;
-    /* line-height: 42px; */
-    
+  color: #343434;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
 }
-
-
 header nav span.menu_item a:hover {
-    color: #F07D3E;
+  color: #F07D3E;
 }
-
 header nav span.menu_item.active {
-    border-bottom: unset;
+  border-bottom: unset;
 }
 header nav span.menu_item.active a {
-    color: #F07D3E;
+  color: #F07D3E;
 }
-
 header .logo a img {
-    height: 45px;
+  height: 45px;
 }
 header .logo a img:last-of-type {
-    margin-left: 32px;
-
+  margin-left: 32px;
 }
-
 header nav span.lang_switch img {
-    padding-right: 6px;
-}
-.flag {
-    display: flex;
-    align-items: unset;
+  padding-right: 6px;
 }
 
+.flag {
+  display: flex;
+  align-items: unset;
+}
 
 #header-btn {
-    display: inline-block;
-    color: #FFFFFF;
-    background-color: #F07D3E;
-    border: 1px solid #F07D3E;
-
-    font-weight: 700;
-    padding: 6px 20px;
-
-    text-transform: none;
-    text-align: center;
+  display: inline-block;
+  color: #FFFFFF;
+  background-color: #F07D3E;
+  border: 1px solid #F07D3E;
+  font-weight: 700;
+  padding: 6px 20px;
+  text-transform: none;
+  text-align: center;
 }
+
 .nav-desktop {
-    align-items: center;
-    padding-bottom: 13px;
+  align-items: center;
+  padding-bottom: 13px;
 }
 
 #header-btn:hover {
-    color: #F07D3E;
-    background-color: white;
-
-    border: 1px solid #F07D3E;
+  color: #F07D3E;
+  background-color: white;
+  border: 1px solid #F07D3E;
 }
 
 #main .main_content {
-    padding: 0px;
+  padding: 0px;
 }
 
 .hero-container {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    max-width: 1160px;
-    width: 95%;
-    height: auto;
-
-    padding-top: 105px;
-    padding-bottom: 105px;  
-
-    margin: auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  max-width: 1160px;
+  width: 95%;
+  height: auto;
+  padding-top: 105px;
+  padding-bottom: 105px;
+  margin: auto;
 }
-
-
 .hero-container img {
-        
-    max-width: 50%;
-    max-height: 476px;
+  max-width: 50%;
+  max-height: 476px;
 }
-
-
 .hero-container .text {
-    text-align: left;
-    max-width: 50%;
-    margin-right: 10px;
+  text-align: left;
+  max-width: 50%;
+  margin-right: 10px;
 }
-
 .hero-container .text h1 {
-    font-weight: 300;
-    font-size: 50px;
-    line-height: 62px;
-
-    margin-top: 0px;
-    margin-bottom: 25px;
+  font-weight: 300;
+  font-size: 50px;
+  line-height: 62px;
+  margin-top: 0px;
+  margin-bottom: 25px;
 }
-.hero-container .text p{
-    max-width: 390px;
-    margin-top: 0px;
-    margin-bottom: 25px;
-    font-size: 18px;
-
-    line-height: 26px;
+.hero-container .text p {
+  max-width: 390px;
+  margin-top: 0px;
+  margin-bottom: 25px;
+  font-size: 18px;
+  line-height: 26px;
 }
-
 .hero-container a {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    font-size: 16px;
-    font-weight: 600;
-    line-height: 26px;
-
-    padding: 11px 16px;
-    width: 286px;
-    background-color: #F07D3E;
-    border: 1px solid #F07D3E;
-    color: white;
-
-    background: linear-gradient(to left, #F07D3E 50%, white 50%) right;
-    background-size: 200%;
-    transition: .3s ease-out;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 26px;
+  padding: 11px 16px;
+  width: 286px;
+  background-color: #F07D3E;
+  border: 1px solid #F07D3E;
+  color: white;
+  background: linear-gradient(to left, #F07D3E 50%, white 50%) right;
+  background-size: 200%;
+  transition: 0.3s ease-out;
 }
 .hero-container a:hover {
-    background-color: white;
-    color: #F07D3E;
-    border: 1px solid #F07D3E;
-
-    background-position: left;
-
-
-
+  background-color: white;
+  color: #F07D3E;
+  border: 1px solid #F07D3E;
+  background-position: left;
 }
-
-
 .hero-container img {
-    max-height: 476px;
-    max-width: auto;
+  max-height: 476px;
+  max-width: auto;
 }
 
 .povezave_container {
-    max-width: 100%;
-    background-color: #FCFCFC;
-
-
+  max-width: 100%;
+  background-color: #FCFCFC;
 }
 
 .pomembne_povezave {
-    max-width: 1160px;
-    width: 95%;
-    padding-top: 110px;
-    padding-bottom: 105px;
-
-    margin: auto;
+  max-width: 1160px;
+  width: 95%;
+  padding-top: 110px;
+  padding-bottom: 105px;
+  margin: auto;
 }
 
 .povezave {
-
-    display: flex;
-    justify-content: space-between;
+  display: flex;
+  justify-content: space-between;
+}
+.povezave h2 {
+  font-style: normal;
+  font-weight: 700;
+  font-size: 18px;
+  line-height: 23px;
+  margin-top: 25px;
+  margin-bottom: 8px;
+}
+.povezave .col {
+  text-align: center;
+  max-width: min(254px, 25%);
+  flex: 1;
+  margin-right: 25px;
+}
+.povezave .col:last-child {
+  margin-right: 0px;
+}
+.povezave .col p {
+  max-width: 253px;
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 26px;
+  margin-top: 0px;
+  margin-bottom: 25px;
 }
 
 .title {
-
-    font-style: normal;
-    font-weight: 400;
-    font-size: 32px;
-    line-height: 36px;
-
-    text-align: center;
-    margin-top: 0px;
-    margin-bottom: 70px;
-    
+  font-style: normal;
+  font-weight: 400;
+  font-size: 32px;
+  line-height: 36px;
+  text-align: center;
+  margin-top: 0px;
+  margin-bottom: 70px;
 }
 
-.povezave h2 {
-    font-style: normal;
-    font-weight: 700;
-    font-size: 18px;
-    line-height: 23px;
-
-    margin-top: 25px;
-    margin-bottom: 8px;
-
-    
+.povezave_img {
+  height: 100px;
+  width: 100px;
 }
 
-.povezave .col{
-
-    text-align: center;
-    max-width: min(254px,25%);
-
-    flex: 1;
-    margin-right: 25px;
-}
-.povezave .col:last-child{
-    margin-right: 0px;
-}
-
-.povezave_img{
-    height: 100px;
-    width: 100px;
-}
-
-.povezave .col p {
-    /* min-height: 110px; */
-    max-width: 253px;
-
-    font-style: normal;
-    font-weight: 400;
-    font-size: 16px;
-    line-height: 26px;
-
-    margin-top: 0px;
-    margin-bottom: 25px;   
-}
 @media screen and (max-width: 1000px) {
-    .povezave .col p {
-        min-height: 110px;
-        margin-bottom: 0px;
-    }
+  .povezave .col p {
+    min-height: 110px;
+    margin-bottom: 0px;
+  }
 }
-
 #povezave-btn {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    /* background-color: white; */
-    background-color: unset;
-    border: 1px solid #F07D3E;
-    color: #F07D3E;
-    font-size: 16px;
-    font-weight: 600;
-    line-height: 26px;
-
-    padding: 11px 16px;
-    margin: 0px auto;
-    max-width: 165px;
-    
-    background: linear-gradient(to left,#FCFCFC 50%, #F07D3E 50%) right;
-    background-size: 200%;
-    transition: .3s ease-out;
-    
-} 
-
-#povezave-btn:hover {
-    color: white;
-    background-color: #F07D3E;
-
-    border: 1px solid #F07D3E;
-
-    background-position: left;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  /* background-color: white; */
+  background-color: unset;
+  border: 1px solid #F07D3E;
+  color: #F07D3E;
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 26px;
+  padding: 11px 16px;
+  margin: 0px auto;
+  max-width: 165px;
+  background: linear-gradient(to left, #FCFCFC 50%, #F07D3E 50%) right;
+  background-size: 200%;
+  transition: 0.3s ease-out;
+}
+#povezave-btn:hover {
+  color: white;
+  background-color: #F07D3E;
+  border: 1px solid #F07D3E;
+  background-position: left;
 }
-
 
 footer {
-    /* max-width: 1160px;
-    margin: auto; */
-    padding-top: 105px;
+  padding-top: 105px;
+}
+footer h2 {
+  text-transform: uppercase;
+  font-weight: 700;
+  font-size: 18px;
+  line-height: 24px;
+  margin: 0px;
+  padding-bottom: 12px;
 }
 footer .footer_content {
-    max-width: 1160px;
-    width: 95%;
-    margin: auto;
+  max-width: 1160px;
+  width: 95%;
+  margin: auto;
+  padding: 0px;
 }
-
-footer h2 {
-    text-transform: uppercase;
-    font-weight: 700;
-    font-size: 18px;
-    line-height: 24px;
-
-    margin: 0px;
-    padding-bottom: 12px;  
+footer .footer_content .col {
+  max-width: 254px;
+}
+footer .footer_content .col span {
+  font-weight: 400;
+  padding-top: 0px;
+  padding-bottom: 12px;
+}
+footer .footer_content .col span a {
+  color: #343434;
+}
+footer .footer_content .col .logo_holder {
+  margin: 0px;
+}
+footer .footer_content .col .logo_holder img {
+  margin-bottom: 25px;
+  text-align: left;
+}
+footer .footer_content .col .logo_holder img.arnes-logo {
+  max-width: 145px;
+}
+footer .footer_content .col1 .col1-flex {
+  display: flex;
+  flex-direction: column;
 }
 footer .footer_content .col4 h2 {
-    padding-bottom: 24px;
+  padding-bottom: 24px;
 }
-
 footer .col a {
-    color: #343434;
-    font-size: 16px;
-    line-height: 26px;
+  color: #343434;
+  font-size: 16px;
+  line-height: 26px;
 }
 
-
-
 .social_logo_flex img {
-    margin-right: 20px;
-    
+  margin-right: 20px;
 }
 
 .social_logo_flex img:hover {
-    opacity: 0.8;
-}
-
-footer .footer_content {
-    padding: 0px;
-}
-
-footer .footer_content .col {
-    max-width: 254px;
-    
-}
-
-footer .footer_content .col span {
-    font-weight: 400;
-    padding-top: 0px;
-    padding-bottom: 12px;
-}
-footer .footer_content .col span a {
-    color: #343434;
-}
-
-footer .footer_content .col1 .col1-flex {
-    display: flex;
-    flex-direction: column;
-}
-
-footer .footer_content .col .logo_holder {
-    margin: 0px;
-}
-
-footer .footer_content .col .logo_holder img {
-    margin-bottom: 25px;
-    text-align: left;
+  opacity: 0.8;
 }
 
 .arnes-logo {
-    height: 45px;
+  height: 45px;
 }
-footer .footer_content .col .logo_holder img.arnes-logo {
-    max-width: 145px;
-}
-
 
 /* GDPR ZAHTEVEK -------------------------------------- */
-
-
 body.gdpr {
-    line-height: 20px;
+  line-height: 20px;
 }
 
 .gdpr #main .main_content {
-    padding: 0px;
+  padding: 0px;
 }
 
- .register_holder{
-    max-width: 810px;
-    width: 95%;
-    margin: 70px auto 70px auto;
+.register_holder {
+  max-width: 810px;
+  width: 95%;
+  margin: 70px auto 70px auto;
 }
-
 .register_holder h1 {
-    font-size: 50px;
-    font-weight: 300;
-    line-height: 62px;
-
-    margin: 20px 0px;
+  font-size: 50px;
+  font-weight: 300;
+  line-height: 62px;
+  margin: 20px 0px;
 }
 .register_holder p {
-    font-weight: 400;
-    line-height: 26px;
-
-    margin: 20px 0px;
+  font-weight: 400;
+  line-height: 26px;
+  margin: 20px 0px;
 }
 .register_holder p a {
-    color: #1e88e5;
+  color: #1e88e5;
 }
 
-
-
 body.gdpr div.label {
-    display: block;
-    line-height: unset;
-    font-weight: 600;
-    width: 200px;
-
-    line-height: unset;
-
+  display: block;
+  line-height: unset;
+  font-weight: 600;
+  width: 200px;
+  line-height: unset;
 }
+
 body #main .main_content .register_holder .label {
-    line-height: 20px;
-    padding-bottom: 4px;
+  line-height: 20px;
+  padding-bottom: 4px;
 }
 
 body.gdpr .input_field div.label label {
-    line-height: unset;
-    padding-bottom: 4px;
+  line-height: unset;
+  padding-bottom: 4px;
 }
 
-
-
-
 .regfield {
-    height: 38px;
-    max-width: 245px;
-    width: 95%;
-    border: 1px solid #C4C4C4;
-    border-radius: 0px;
-
-    padding: 0px;
-    padding-left: 8px;
-    margin: 0px;
+  height: 38px;
+  max-width: 245px;
+  width: 95%;
+  border: 1px solid #C4C4C4;
+  border-radius: 0px;
+  padding: 0px;
+  padding-left: 8px;
+  margin: 0px;
 }
 
-body .gdpr form p:first-of-type{
-    font-weight: 600;
+body .gdpr form p:first-of-type {
+  font-weight: 600;
 }
 
-body.gdpr div.input_field{
-    padding: 10px 0px;
+body.gdpr div.input_field {
+  padding: 10px 0px;
 }
+
 /* Elektronski naslov:  */
 body.gdpr div.input_field:first-of-type {
-    padding-top: 0px;
+  padding-top: 0px;
 }
+
 /* URL ankete:  */
-body.gdpr div.input_field:nth-of-type(3){
-    padding-bottom: 0px;
+body.gdpr div.input_field:nth-of-type(3) {
+  padding-bottom: 0px;
 }
 
 /* Želim podati zahtevo za:  */
 form p:first-of-type {
-    margin: 20px 0px 6px 0px;
+  margin: 20px 0px 6px 0px;
 }
 
-
-
 body.gdpr div.zahtevek {
-    padding: 6px 0px;
+  padding: 6px 0px;
 }
+
 body.gdpr div.zahtevek:last-of-type {
-    padding-bottom: 0px;
+  padding-bottom: 0px;
 }
- /* body.gdpr div.zahtevek label {
-    line-height: 26px;
-} */
-/* body.gdpr div.zahtevek label b {
-    margin-right: 3px;
-}  */
 
 body.gdpr div.zahtevek label input {
-    margin-right: 2px;
-    margin-left: 0px;
-    height: 18px;
-    width: 18px;
-
-    border-radius: 0px;
+  margin-right: 2px;
+  margin-left: 0px;
+  height: 18px;
+  width: 18px;
+  vertical-align: -1px;
+  border-radius: 0px;
 }
 
-
-
-
 /* tekst nad poljem za opis */
-form p:nth-of-type(2){
-    margin: 20px 0px;
+form p:nth-of-type(2) {
+  margin: 20px 0px;
 }
-form .opis {
-    font-weight: 600;
 
-    margin: 0px 0px 4px 0px;
+form .opis {
+  font-weight: 600;
+  margin: 0px 0px 4px 0px;
 }
 
 #gdpr-note {
-    padding: 0px;
-    padding-left: 8px;
-    margin: 0px;
-    width: 100%;
-
-    border-radius: 0px;
-
+  padding: 0px;
+  padding-left: 8px;
+  margin: 0px;
+  width: 100%;
+  border-radius: 0px;
 }
 
 .register_holder p:last-of-type {
-    margin: 18px 0px 20px 0px;
-    line-height: 26px;
+  margin: 18px 0px 20px 0px;
+  line-height: 26px;
 }
 
 input[type=submit],
-button:hover,
+button,
 input[type=button],
 .button {
-    font-weight: 600;
-    font-size: 16px;
-    line-height: 26px;
-    height: 50px;
-    max-width: 320px;
-    width: 95%;
-    padding: 0px;
-
-    background: linear-gradient(to left,#F07D3E 50%, white 50%) right;
-    background-size: 200%;
-    transition: .3s ease-out;
+  font-weight: 600;
+  font-size: 16px;
+  line-height: 26px;
+  height: 50px;
+  max-width: 320px;
+  width: 95%;
+  padding: 0px;
+  color: #FFFFFF;
+  background-color: #F07D3E;
+  border: 1px solid #F07D3E;
+  transition: 0.3s ease-out;
 }
-
-
 input[type=submit]:hover,
 button:hover,
 input[type=button]:hover,
 .button:hover {
-  border:  1px solid #F07D3E;
   color: #F07D3E;
-
-  background-position: left;
-
+  background-color: white;
+  border: 1px solid #F07D3E;
 }
 
-
- 
 /* -------------------------------------- */
-
 @media screen and (max-width: 834px) {
-
-    header {
-        margin: none;
-        /* padding-left: 25px;
-        padding-right: 29px; */
-    } 
-
+  header {
+    margin: none;
     /* header - arnes logo fix */
-    header .logo {
-        width: auto;
-        /* background-color: red; */
-    }
+  }
+  header .logo {
+    width: auto;
+  }
 
+  .hero-container {
+    display: flex;
+    flex-direction: column-reverse;
+    padding-top: 70px;
+    padding-bottom: 50px;
+    height: auto;
+  }
+  .hero-container img {
+    max-width: 65%;
+  }
+  .hero-container .text {
+    margin: auto;
+    text-align: center;
+  }
+  .hero-container .text h1 {
+    margin-top: 50px;
+  }
+  .hero-container .text p {
+    margin-bottom: 25px;
+    max-width: 390px;
+  }
+  .hero-container .text a {
+    width: 80%;
+    max-width: 280px;
+    margin: auto;
+  }
 
-    .hero-container {
-        display: flex;
-        flex-direction: column-reverse;  
-        
-        
-        padding-top: 70px;
-        padding-bottom: 50px;
+  .register_holder {
+    margin-top: 70px;
+    margin-bottom: 70px;
+  }
 
-        height: auto;
-    }
+  .pomembne_povezave {
+    padding-top: 68px;
+    padding-bottom: 70px;
+  }
 
-    .register_holder {
-        margin-top: 70px;
-        margin-bottom: 70px;
-    }
+  .povezave {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    row-gap: 30px;
+  }
+  .povezave .col {
+    margin-top: 50px;
+    width: auto;
+    max-width: none;
+  }
+  .povezave .col p {
+    max-width: 392px;
+    min-height: unset;
+    margin-bottom: 25px;
+  }
+  .povezave .col:last-child {
+    margin-right: 25px;
+  }
 
+  .title {
+    margin-bottom: 0px;
+  }
 
-    .hero-container img {
-        max-width: 65%;
-    }
-
-    .hero-container .text h1 {
-        margin-top: 50px;
-    }
-    .hero-container .text p {
-        margin-bottom: 25px;
-        max-width: 390px;
-    }
-    .hero-container .text a {
-        width: 80%;
-        max-width: 280px;
-        margin: auto;
-    }
-
-    .hero-container .text {
-        margin: auto;
-        text-align: center;
-
-    }
-
-    .pomembne_povezave {
-        padding-top: 68px;
-        padding-bottom: 70px;
-    }
-    
-    .povezave{
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-
-        row-gap: 30px;
-    }
-
-    .title {
-        margin-bottom: 0px;
-        
-    }
-
-    .povezave .col  {
-        margin-top: 50px;
-        width: auto;
-        max-width: none; 
-    }
-    .povezave .col:last-child{
-        margin-right: 25px;
-    }
-
-
-    .povezave .col p {
-        max-width: 392px;
-        
-
-        min-height: unset;
-        margin-bottom: 25px;
-    }
-    /* @media screen and (max-width: 735px) {
-        .povezave .col p {
-            min-height: 80px;
-        }
-    } */
-
-    #povezave-btn {
-        margin: 0px auto;
-    }
-
-    footer {
-        padding: 70px 0px 0px 0px;
-    }
-
-    footer .footer_content {
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr ;
-        grid-template-rows: 1fr 2fr;
-    }
-
-
-    footer .footer_content .col{
-        /* border: 1px solid red; */
-        max-width: 100%;
-        width: auto;
-
-    }
-
-    footer .footer_content .col .logo_holder{
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between; 
-        
-        max-width: 100%;
-    }
-    footer .footer_content .col .logo_holder img{
-        max-width: 33%;
-        height: auto;
-        margin: 0px;
-    }
-
-    footer .footer_content .col4 h2 {
-        padding-bottom: 12px;
-    }
-
-
-    footer .footer_content .col1  {
-        grid-row: 1/3;
-    }
-
-    footer .footer_content .col4  {
-        grid-column: 2/4;
-    }
-
-    footer .footer_content .col1 .col1-flex {
-        display: flex;
-        flex-direction: column;
-    }
+  #povezave-btn {
+    margin: 0px auto;
+  }
 
+  footer {
+    padding: 70px 0px 0px 0px;
+  }
+  footer .footer_content {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    grid-template-rows: 1fr 2fr;
+  }
+  footer .footer_content .col {
+    max-width: 100%;
+    width: auto;
+  }
+  footer .footer_content .col .logo_holder {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    max-width: 100%;
+  }
+  footer .footer_content .col .logo_holder img {
+    max-width: 33%;
+    height: auto;
+    margin: 0px;
+  }
+  footer .footer_content .col1 {
+    grid-row: 1/3;
+  }
+  footer .footer_content .col1 .col1-flex {
+    display: flex;
+    flex-direction: column;
+  }
+  footer .footer_content .col4 {
+    grid-column: 2/4;
+  }
+  footer .footer_content .col4 h2 {
+    padding-bottom: 12px;
+  }
 }
-
-
-
 @media screen and (max-width: 740px) {
+  body.landing_page #main .main_content {
+    padding: 0px;
+  }
 
-    body.landing_page #main .main_content {
-        padding: 0px;
-    }
+  body #main .main_content h1 {
+    font-size: 50px;
+  }
 
-    body #main .main_content h1 {
-        font-size: 50px;
-    }
+  header .logo a img {
+    max-height: 29px;
+    max-width: 95px;
+  }
 
-    header .logo a img {
-        max-height: 29px;
-        max-width: 95px ;
+  header .logo a img:last-of-type {
+    margin-left: 12px;
+  }
 
-    }
-    header .logo a img:last-of-type{
-        margin-left: 12px;
-    }
+  .hero-container {
+    padding-top: 50px;
+  }
+  .hero-container .text {
+    max-width: 100%;
+  }
+  .hero-container .text a {
+    color: white;
+  }
+  .hero-container .text a:hover {
+    width: 95%;
+    border: 1px solid #F07D3E;
+    color: #F07D3E;
+    background-color: white;
+  }
+  .hero-container img {
+    max-width: 80%;
+  }
 
-    .hero-container {
-        padding-top: 50px;
-    }
-    .hero-container .text {
-        max-width: 100%;
-    }
+  .register_holder {
+    margin-top: 50px;
+    margin-bottom: 46px;
+  }
 
-    .hero-container img {
-        max-width: 80%;
-    }
+  body #main .main_content .register_holder h1 {
+    text-align: unset;
+    padding: 0px;
+  }
 
+  .pomembne_povezave {
+    padding-top: 46px;
+    padding-bottom: 46px;
+  }
 
+  .title {
+    margin-bottom: 49px;
+    margin-top: 0px;
+  }
 
-    .hero-container .text a {
-        color: white;  
-    }
-    .hero-container .text a:hover {
-        width: 95%;
-        border:  1px solid #F07D3E;
-        color: #F07D3E;
-        background-color: white;
-    }
+  .povezave {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .povezave .col {
+    margin: 50px 20px 20px 0px;
+  }
+  .povezave .col p {
+    min-height: unset;
+  }
 
-    .register_holder {
-        margin-top: 50px;
-        margin-bottom: 46px;
-    }
-    body #main .main_content .register_holder h1 {
-        text-align: unset;
-        padding: 0px;
-    }
+  .povezave .col:nth-of-type(1),
+.povezave .col:nth-of-type(3),
+.povezave .col:nth-of-type(2),
+.povezave .col:nth-of-type(4) {
+    margin: auto;
+    margin-bottom: 30px;
+  }
 
+  .povezave .col:nth-of-type(4) {
+    margin-bottom: 0px;
+  }
 
-    .pomembne_povezave {
-        padding-top: 46px;
-        padding-bottom: 46px;
-    }
+  /* --------------HAMBURGER---------------------------------- */
+  .nav-desktop {
+    display: none;
+  }
 
-    .title {
-        margin-bottom: 49px;
-        margin-top: 0px;
-    }
+  .mobile {
+    display: block;
+  }
 
-    .povezave {
-        display: flex;
-        flex-direction: column;
-        
-        align-items: center;
-    }
+  #nav-icon3 {
+    width: 38px;
+    height: 20px;
+    position: relative;
+    bottom: 15px;
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+    -webkit-transition: 0.5s ease-in-out;
+    -moz-transition: 0.5s ease-in-out;
+    -o-transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
+    cursor: pointer;
+  }
+  #nav-icon3 span {
+    display: block;
+    position: absolute;
+    height: 5px;
+    width: 100%;
+    background: #F07D3E;
+    border-radius: 9px;
+    opacity: 1;
+    left: 0;
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+    -webkit-transition: 0.25s ease-in-out;
+    -moz-transition: 0.25s ease-in-out;
+    -o-transition: 0.25s ease-in-out;
+    transition: 0.25s ease-in-out;
+  }
+  #nav-icon3 span:nth-child(1) {
+    top: 0px;
+  }
+  #nav-icon3 span:nth-child(2),
+#nav-icon3 span:nth-child(3) {
+    top: 9px;
+  }
+  #nav-icon3 span:nth-child(4) {
+    top: 18px;
+  }
 
-    .povezave .col {
-        margin: 50px 20px 20px 0px;   
-    }
-    .povezave .col p {
-        min-height: unset;
-        
-    }
+  #nav-icon3.open span:nth-child(1) {
+    top: 9px;
+    width: 0%;
+    left: 50%;
+  }
 
-    .povezave .col:nth-of-type(1),
-    .povezave .col:nth-of-type(3), 
-    .povezave .col:nth-of-type(2),
-    .povezave .col:nth-of-type(4) {
-        margin: auto;
-        margin-bottom: 30px;
-    }
+  #nav-icon3.open span:nth-child(2) {
+    -webkit-transform: rotate(45deg);
+    -moz-transform: rotate(45deg);
+    -o-transform: rotate(45deg);
+    transform: rotate(45deg);
+  }
 
-    .povezave .col:nth-of-type(4) {
-        margin-bottom: 0px;
-    }
+  #nav-icon3.open span:nth-child(3) {
+    -webkit-transform: rotate(-45deg);
+    -moz-transform: rotate(-45deg);
+    -o-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+  }
 
+  #nav-icon3.open span:nth-child(4) {
+    top: 9px;
+    width: 0%;
+    left: 50%;
+  }
 
+  #links {
+    display: none;
+  }
 
+  /*  */
+  .aai a {
+    color: #333333;
+  }
 
-    /* --------------HAMBURGER---------------------------------- */
-
-
-    .nav-desktop {
-        display: none;
-        
-    }
-
-    .mobile {
-        display: block;
-    }
-
-    #nav-icon3 {
-
-        width: 38px;
-        height: 20px;
-        position: relative;
-
-
-        bottom: 15px;
-        
-        -webkit-transform: rotate(0deg);
-        -moz-transform: rotate(0deg);
-        -o-transform: rotate(0deg);
-        transform: rotate(0deg);
-        -webkit-transition: .5s ease-in-out;
-        -moz-transition: .5s ease-in-out;
-        -o-transition: .5s ease-in-out;
-        transition: .5s ease-in-out;
-        cursor: pointer;
-    }
-
-    #nav-icon3 span {
-        display: block;
-        position: absolute;
-        height: 5px;
-        width: 100%;
-        background: #F07D3E;
-        border-radius: 9px;
-        opacity: 1;
-        left: 0;
-        -webkit-transform: rotate(0deg);
-        -moz-transform: rotate(0deg);
-        -o-transform: rotate(0deg);
-        transform: rotate(0deg);
-        -webkit-transition: .25s ease-in-out;
-        -moz-transition: .25s ease-in-out;
-        -o-transition: .25s ease-in-out;
-        transition: .25s ease-in-out;
-    }
-      
-
-    #nav-icon3 span:nth-child(1) {
-        top: 0px;
-    }
-      
-    #nav-icon3 span:nth-child(2),#nav-icon3 span:nth-child(3) {
-        top: 9px;
-    }
-      
-    #nav-icon3 span:nth-child(4) {
-        top: 18px;
-    }
-      
-    #nav-icon3.open span:nth-child(1) {
-        top: 9px;
-        width: 0%;
-        left: 50%;
-    }
-      
-    #nav-icon3.open span:nth-child(2) {
-        -webkit-transform: rotate(45deg);
-        -moz-transform: rotate(45deg);
-        -o-transform: rotate(45deg);
-        transform: rotate(45deg);
-    }
-      
-    #nav-icon3.open span:nth-child(3) {
-        -webkit-transform: rotate(-45deg);
-        -moz-transform: rotate(-45deg);
-        -o-transform: rotate(-45deg);
-        transform: rotate(-45deg);
-    }
-      
-    #nav-icon3.open span:nth-child(4) {
-        top: 9px;
-        width: 0%;
-        left: 50%;
-    }
-
-    #links {
-        display: none;
-
-        
-        
-    }
-
-    /*  */
-    .aai a  {
-        color: #333333;
-    }
-      
-    #links.open {
-        position: absolute;
-        top: 100px;
-        left: 0px;
-
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-
-        
-        
-
-        width: 100%;
-        height: 700px;
-        background-color: rgb(255, 255, 255);
-
-    }
-
-    #links .menu_item {
-        font-size: 30px;
-        margin-top: 30px;
-    }
-
-    #links .menu_item a {
-        font-size: 16px;
-    }
-
-    /* ------------------------------------------------- */
-    footer {
-        margin: 0px;
-        padding: 0px;
-        padding-top: 50px;
-
-    }
-
-    footer .footer_content {
-        /* background-color: rgb(184, 184, 184); */
-
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap; 
-
-        padding: 0px 20px;
-    }
-
-    footer .footer_content h2 {
-        padding-top: 12px;
-    }
-
-    footer .footer_content .col {
-        /* border: 1px solid red; */
-        width: auto;
-        max-height: 180px;
-
-        text-align: left;
-
-        /* flex: 1;
-        margin-right: 25px; */
-    }
-    footer .footer_content .col:last-child{
-        /* margin-right: 0px; */
-    }
-
-    footer .footer_content .col span {
-        padding-bottom: 16px;
-    }
-
-    footer .footer_content .col1 .col1-flex{
-        display: flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-
-        max-height: 130px;
-    }
-
-
-
-
-    footer .footer_content .col1{
-        max-width: 100%;
-        width: 100%;
-        /* border: 1px solid red; */
-
-
-    }
-
-
-    footer .footer_content .col2,
-    footer .footer_content .col3  {
-        max-width: 50%;
-        width: 50%;  
-    }
-
-    footer .footer_content .col .logo_holder {
-        flex-direction: column;
-        justify-content: unset;
-    }
-    footer .footer_content .col .logo_holder img {
-        max-width: unset;
-        padding-bottom: 12px;
-    }
+  #links.open {
+    position: absolute;
+    top: 100px;
+    left: 0px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    height: 700px;
+    background-color: white;
+  }
 
+  #links .menu_item {
+    font-size: 30px;
+    margin-top: 30px;
+  }
+  #links .menu_item a {
+    font-size: 16px;
+  }
 
+  footer {
+    margin: 0px;
+    padding: 0px;
+    padding-top: 50px;
+  }
+  footer .footer_content {
+    /* background-color: rgb(184, 184, 184); */
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    padding: 0px 20px;
+  }
+  footer .footer_content h2 {
+    padding-top: 12px;
+  }
+  footer .footer_content .col {
+    /* border: 1px solid red; */
+    width: auto;
+    max-height: 180px;
+    text-align: left;
+  }
+  footer .footer_content .col span {
+    padding-bottom: 16px;
+  }
+  footer .footer_content .col .logo_holder {
+    flex-direction: column;
+    justify-content: unset;
+  }
+  footer .footer_content .col .logo_holder img {
+    max-width: unset;
+    padding-bottom: 12px;
+  }
+  footer .footer_content .col1 .col1-flex {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    max-height: 130px;
+  }
+  footer .footer_content .col1 {
+    max-width: 100%;
+    width: 100%;
+    /* border: 1px solid red; */
+  }
+  footer .footer_content .col2,
+footer .footer_content .col3 {
+    max-width: 50%;
+    width: 50%;
+  }
 }
-
-@media screen and (max-width: 700px){
-    body #main .main_content input[type=submit],
-    body #main .main_content input[type=button] {
-        display: block;
-        width: 100%;
-        margin: 20px 0px !important;
-      }
+@media screen and (max-width: 700px) {
+  body #main .main_content input[type=submit],
+body #main .main_content input[type=button] {
+    display: block;
+    width: 100%;
+    margin: 20px 0px !important;
+  }
 }
-
-
-
 @media screen and (max-width: 365px) {
-    footer .footer_content {
-        flex-direction: column;
-        align-items: center;
+  footer .footer_content {
+    flex-direction: column;
+    align-items: center;
+    padding: 0px;
+  }
+  footer .footer_content .col {
+    max-height: unset;
+    text-align: center;
+  }
+  footer .footer_content .col h2 {
+    text-align: center;
+  }
+  footer .footer_content .col1 .col1-flex {
+    max-height: unset;
+    align-items: center;
+  }
+  footer .footer_content .col3 {
+    max-width: unset;
+    width: unset;
+  }
+  footer .footer_content .col3 .social_logo_flex {
+    padding-left: 10px;
+  }
+}
 
-        padding: 0px;
-    }
-
-    footer .footer_content .col {
-        max-height: unset;
-        text-align: center;
-    }
-
-    footer .footer_content .col h2 {
-        text-align: center;
-    }
-    footer .footer_content .col1 .col1-flex {
-        max-height: unset;
-
-        align-items: center;
-    }
-
-    footer .footer_content .col3 {
-        max-width: unset;
-        width: unset;
-    }
-
-    footer .footer_content .col3 .social_logo_flex  {
-        padding-left: 10px;
-    }
-
-}
\ No newline at end of file
+/*# sourceMappingURL=aai.css.map */
diff --git a/frontend/simple/css/style.css b/frontend/simple/css/style.css
index c88cd59c6..016600ca3 100644
--- a/frontend/simple/css/style.css
+++ b/frontend/simple/css/style.css
@@ -273,13 +273,6 @@ footer .footer_content .col .logo_holder img {
   background-color: #4ca0ea;
 }
 
-.aai .cookie_notice button {
-  background-color: #e35205;
-}
-.aai .cookie_notice button:hover {
-  background-color: #fa6c21;
-}
-
 body.landing_page #main,
 body.register #main,
 body.login #main,
@@ -723,82 +716,6 @@ body.reset_password_activate div.label {
 }
 
 /******************************/
-body.landing_page #content.aai #main,
-body.register #content.aai #main,
-body.login #content.aai #main,
-body.login_noEmail #content.aai #main {
-  min-height: auto;
-  background-image: url("../img/landing_page_image_aai.png");
-}
-body.landing_page #content.aai #main .landing_page_window,
-body.register #content.aai #main .landing_page_window,
-body.login #content.aai #main .landing_page_window,
-body.login_noEmail #content.aai #main .landing_page_window {
-  width: 500px;
-  padding: 50px;
-  margin-top: 70px;
-  text-align: center;
-  box-shadow: 1px 1px 4px 1px #999;
-}
-body.landing_page #content.aai #main .landing_page_window .app_title,
-body.register #content.aai #main .landing_page_window .app_title,
-body.login #content.aai #main .landing_page_window .app_title,
-body.login_noEmail #content.aai #main .landing_page_window .app_title {
-  width: 500px;
-  margin: 0;
-  color: #333;
-}
-body.landing_page #content.aai #main .landing_page_window .arnes_logo,
-body.register #content.aai #main .landing_page_window .arnes_logo,
-body.login #content.aai #main .landing_page_window .arnes_logo,
-body.login_noEmail #content.aai #main .landing_page_window .arnes_logo {
-  margin: 30px 0;
-}
-body.landing_page #content.aai #main .landing_page_window .arnes_logo img,
-body.register #content.aai #main .landing_page_window .arnes_logo img,
-body.login #content.aai #main .landing_page_window .arnes_logo img,
-body.login_noEmail #content.aai #main .landing_page_window .arnes_logo img {
-  width: 200px;
-  height: auto;
-}
-body.landing_page #content.aai #main .landing_page_window .tab,
-body.register #content.aai #main .landing_page_window .tab,
-body.login #content.aai #main .landing_page_window .tab,
-body.login_noEmail #content.aai #main .landing_page_window .tab {
-  font-size: 16px;
-  text-transform: none;
-  line-height: 24px;
-}
-body.landing_page #content.aai #main .landing_page_window input[type=button],
-body.register #content.aai #main .landing_page_window input[type=button],
-body.login #content.aai #main .landing_page_window input[type=button],
-body.login_noEmail #content.aai #main .landing_page_window input[type=button] {
-  width: auto;
-  padding: 18px 30px;
-  margin: 30px 0 10px 0;
-  font-weight: 600;
-  text-transform: none;
-  background-color: #e35205;
-  border-radius: 5px;
-}
-body.landing_page #content.aai #main .landing_page_window input[type=button]:hover,
-body.register #content.aai #main .landing_page_window input[type=button]:hover,
-body.login #content.aai #main .landing_page_window input[type=button]:hover,
-body.login_noEmail #content.aai #main .landing_page_window input[type=button]:hover {
-  background-color: #fa6c21;
-}
-body.landing_page #content.aai #main .app_subtitle,
-body.register #content.aai #main .app_subtitle,
-body.login #content.aai #main .app_subtitle,
-body.login_noEmail #content.aai #main .app_subtitle {
-  width: 500px;
-  margin: 10px auto;
-  color: #333;
-  font-size: 20px;
-  font-weight: 600;
-  text-shadow: none;
-}
-
 /* Mobile prilagoditve */
 @media screen and (max-width: 700px) {
   header nav {
diff --git a/lang/1.php b/lang/1.php
index 190f97aa5..267b29ad2 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2355,6 +2355,7 @@ $lang = array (
 	"srv_statistics_edit" 	=>	 "Uvodni tekst h rezultatom",
     "srv_zapri"             =>	 "Zapri",
     "srv_potrdi"            =>	 "Potrdi",
+    "srv_potrdi2"           =>	 "Potrdi",
     "srv_potrdi_new"        =>	 "Ustvari novo anketo",
     "srv_create_new"        =>	 "Kreiraj",
 	"srv_create_survey"     =>	 "Ustvari Anketo",
diff --git a/lang/2.php b/lang/2.php
index 6b0e319cf..48bbc1188 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2340,6 +2340,7 @@ $lang = array (
 	"srv_statistics_edit" 	=>	"Intro text for results",
     "srv_zapri"             =>  "Close",
     "srv_potrdi"            =>  "Confirm",
+    "srv_potrdi2"           =>	"Submit",
     "srv_potrdi_new"        =>  "Confirm",
     "srv_create_new"        =>	"Create",
 	"srv_create_survey"     =>	"Create Survey",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index bfe0104bf..63f6649eb 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10145,6 +10145,21 @@ div .table-horizontal-scroll-wrapper2 table {
   margin: 0px;
 }
 
+.table-horizontal-scroll-wrapper-outer {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+}
+.table-horizontal-scroll-wrapper-outer .table-horizontal-scroll-wrapper-inner {
+  overflow-x: auto;
+  width: 100%;
+}
+.table-horizontal-scroll-wrapper-outer .table-horizontal-scroll-wrapper-inner table {
+  width: 100%;
+  table-layout: auto !important;
+  margin-bottom: 0;
+}
+
 /*
     Placljive vsebine
 */
@@ -11151,6 +11166,11 @@ table.variableView {
   width: 100%;
 }
 
+.fullwidth #gdpr_nastavitve {
+  padding: 0 16px;
+  box-sizing: border-box;
+}
+
 table.gdpr_surveys {
   table-layout: fixed;
   width: 100%;
@@ -13302,6 +13322,35 @@ div.drop_setting_transition {
   background-color: #F8F8F8;
 }
 
+/*
+    Status - ip lokacija
+*/
+.page_geoip_location .geoip_holder {
+  display: flex;
+  margin: 16px 0 0 0;
+}
+.page_geoip_location .geoip_holder .geoip_table_holder {
+  width: 100%;
+}
+.page_geoip_location .geoip_holder .geoip_table_holder .geoip_table {
+  width: 100%;
+  margin: 0;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder {
+  margin: 0 0 0 32px;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation {
+  display: flex;
+  margin-bottom: 16px;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a {
+  margin-right: 16px;
+  color: #808080;
+}
+.page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a:hover, .page_geoip_location .geoip_holder .geoip_map_holder .geoip_navigation a.active {
+  color: #1E88E5;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */
@@ -21779,12 +21828,21 @@ span.faicon.st-besede-popup {
 /* Survey title edit */
 #quick_title_edit {
   position: relative;
-  width: 720px;
-  height: 265px;
 }
-#quick_title_edit .quick_title_edit_label {
-  width: 145px;
-  font-weight: 600;
+#quick_title_edit .quick_title_setting {
+  margin-bottom: 16px;
+}
+#quick_title_edit .quick_title_setting .setting_line {
+  display: flex;
+  align-items: center;
+}
+#quick_title_edit .quick_title_setting .setting_line input {
+  margin-right: 8px;
+}
+#quick_title_edit .quick_title_setting .opomba_line {
+  font-size: 14px;
+  font-style: italic;
+  color: #a9a9a9;
 }
 
 /*
@@ -26821,6 +26879,9 @@ ul#merge li {
   overflow: hidden;
   font-size: 14px;
 }
+.quick_edit_container #edit_survey_data .quick_edit_inner {
+  width: 100%;
+}
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka {
   box-sizing: border-box;
   width: 100%;
@@ -26843,6 +26904,12 @@ ul#merge li {
   font-weight: 700;
   font-size: 20px;
 }
+.quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka .naslov .spremenljivka_info {
+  margin-top: 4px;
+  color: #a9a9a9;
+  font-size: 14px;
+  font-weight: 400;
+}
 .quick_edit_container #edit_survey_data .quick_edit_inner .spremenljivka .variable_holder {
   height: auto !important;
 }
diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss
index 1762df436..2053f77b0 100644
--- a/resources/sass/admin_new/components/table/table.scss
+++ b/resources/sass/admin_new/components/table/table.scss
@@ -70,18 +70,36 @@ div {
         width: 100%;
 
         margin: 8px 0;
-  }
+    }
 
     .table-horizontal-scroll-wrapper2 {
         display: table-cell;
         overflow-x: auto;
         width: 100%;
 
-    table {
-        width: 100%;
-        border-collapse: collapse;
-        white-space: nowrap;
-        margin: 0px;
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            white-space: nowrap;
+            margin: 0px;
+        }
     }
-  }
-}
\ No newline at end of file
+}
+
+.table-horizontal-scroll-wrapper-outer{
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+
+    .table-horizontal-scroll-wrapper-inner{
+        overflow-x: auto;
+        width: 100%;
+
+        table {
+            width: 100%;
+            table-layout: auto !important;
+
+            margin-bottom: 0;
+        }
+    }
+}
diff --git a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
index 5ff086fd2..20dd0f493 100644
--- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
+++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
@@ -1,5 +1,10 @@
 // GDPR tabele
 
+.fullwidth #gdpr_nastavitve{
+    padding: 0 16px;
+    box-sizing: border-box;
+}
+
 table {
     &.gdpr_surveys {
         table-layout: fixed;
diff --git a/resources/sass/admin_new/pages/survey_data/quick_edit.scss b/resources/sass/admin_new/pages/survey_data/quick_edit.scss
index ae5d6c8f2..49d26a1a4 100644
--- a/resources/sass/admin_new/pages/survey_data/quick_edit.scss
+++ b/resources/sass/admin_new/pages/survey_data/quick_edit.scss
@@ -228,7 +228,8 @@
 
 
         .quick_edit_inner {
-            
+            width: 100%;
+
             .spremenljivka {
                 box-sizing: border-box;
                 width: 100%;
@@ -249,6 +250,14 @@
                         font-weight: 700;
                         font-size: 20px;
                     }
+                    
+                    .spremenljivka_info{
+                        margin-top: 4px;
+                        
+                        color:#a9a9a9;
+                        font-size: 14px;
+                        font-weight: 400;
+                    }
                 }
                 .variable_holder {
                     height: auto !important;
diff --git a/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss b/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss
index 619c44dee..c14027438 100644
--- a/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss
+++ b/resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss
@@ -3,12 +3,28 @@
 #quick_title_edit {
 	position: relative;
 
-	width: 720px;
-	height: 265px;
+    .quick_title_setting{
+        margin-bottom: 16px;
+
+        .title_line{
+            
+        }
+        
+        .setting_line{
+            display: flex;
+            align-items: center;
+
+            input{
+                margin-right: 8px;
+            }
+        }
+
+        .opomba_line{
+            font-size: 14px;
+            font-style: italic;
+            color: #a9a9a9;
+        }
 
-    .quick_title_edit_label {
-        width: 145px;
-        font-weight: 600;
     }
 }
 
diff --git a/resources/sass/admin_new/pages/survey_status/geoip.scss b/resources/sass/admin_new/pages/survey_status/geoip.scss
new file mode 100644
index 000000000..b3f18dabf
--- /dev/null
+++ b/resources/sass/admin_new/pages/survey_status/geoip.scss
@@ -0,0 +1,40 @@
+/*
+    Status - ip lokacija
+*/
+
+.page_geoip_location{
+
+    .geoip_holder{
+        display: flex;
+
+        margin: 16px 0 0 0;
+
+        .geoip_table_holder {
+            width: 100%;
+            
+            .geoip_table {
+                width: 100%;
+                margin: 0;
+            }
+        }
+
+        .geoip_map_holder{
+            margin: 0 0 0 32px;
+
+            .geoip_navigation{
+                display: flex;
+                margin-bottom: 16px;
+
+                a{
+                    margin-right: 16px;
+                    color: $very-dark-gray2;
+
+                    &:hover,
+                    &.active{
+                        color: $blue; 
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/survey_status/survey_status.scss b/resources/sass/admin_new/pages/survey_status/survey_status.scss
index e310f3a6a..5de2b1eb6 100644
--- a/resources/sass/admin_new/pages/survey_status/survey_status.scss
+++ b/resources/sass/admin_new/pages/survey_status/survey_status.scss
@@ -1,3 +1,4 @@
 @import "summary";
 @import "nonresponse";
-@import "status_advanced";
\ No newline at end of file
+@import "status_advanced";
+@import "geoip";
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/aai.scss b/resources/sass/frontend_simple/aai.scss
new file mode 100644
index 000000000..aa54d1da5
--- /dev/null
+++ b/resources/sass/frontend_simple/aai.scss
@@ -0,0 +1,1031 @@
+/* 
+    Dodaten css za AAI naslovnico
+*/
+
+
+@import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300;400;600;700&display=swap');
+
+* {
+    font-family: "Source Sans Pro","sans-serif";
+}
+
+body {
+    margin: auto;
+    color: #343434;
+}
+
+
+.cookie_notice {
+    max-width: 100%;
+
+    .right button{
+        font-weight: 600;
+        font-size: 16px;
+        line-height: 26px;
+        height: 50px;
+        width: 160px;
+        padding: 0px;
+
+        color: #FFFFFF;
+        background-color: #F07D3E;
+        border: 1px solid #F07D3E;
+        border-radius: 0;
+
+        transition: .3s ease-out;
+
+        &:hover {
+            color: #F07D3E;
+            background-color: white;
+
+            border: 1px solid #F07D3E;
+        }
+    }
+}
+
+
+#main {
+    background-color: white;
+
+    .main_content {
+        max-width: unset;
+    }
+}
+
+
+
+/* nav */
+.mobile{
+    display: none;
+}
+
+body.landing_page #content.aai #main {
+    background-image: none;
+}
+
+
+header {
+    height: unset;
+    padding-top: 13px;
+    padding-left: 0px;
+    padding-right: 0px;
+
+    max-width: 1160px;
+    width: 95%;
+    margin: auto;
+
+    .nav-desktop span.menu_item {
+        margin-left: 32px;
+        text-transform: none;
+    }
+
+    nav span.menu_item {
+        border-bottom: 0px;
+    }
+
+    .nav-desktop span.menu_item a {
+        color: #343434;
+        font-style: normal;
+        font-weight: 400;
+        font-size: 16px;
+    }
+
+    nav span.menu_item a:hover {
+        color: #F07D3E;
+    }
+    nav span.menu_item.active {
+        border-bottom: unset;
+    }
+    nav span.menu_item.active a {
+        color: #F07D3E;
+    }
+
+    .logo a img {
+        height: 45px;
+    }
+    .logo a img:last-of-type {
+        margin-left: 32px;
+    
+    }
+
+    nav span.lang_switch img {
+        padding-right: 6px;
+    }
+}
+
+.flag {
+    display: flex;
+    align-items: unset;
+}
+
+
+#header-btn {
+    display: inline-block;
+    color: #FFFFFF;
+    background-color: #F07D3E;
+    border: 1px solid #F07D3E;
+
+    font-weight: 700;
+    padding: 6px 20px;
+
+    text-transform: none;
+    text-align: center;
+}
+.nav-desktop {
+    align-items: center;
+    padding-bottom: 13px;
+}
+
+#header-btn:hover {
+    color: #F07D3E;
+    background-color: white;
+
+    border: 1px solid #F07D3E;
+}
+
+#main .main_content {
+    padding: 0px;
+}
+
+.hero-container {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    max-width: 1160px;
+    width: 95%;
+    height: auto;
+
+    padding-top: 105px;
+    padding-bottom: 105px;  
+
+    margin: auto;
+
+    img {
+        
+        max-width: 50%;
+        max-height: 476px;
+    }
+
+    .text {
+        text-align: left;
+        max-width: 50%;
+        margin-right: 10px;
+
+        h1 {
+            font-weight: 300;
+            font-size: 50px;
+            line-height: 62px;
+        
+            margin-top: 0px;
+            margin-bottom: 25px;
+        }
+
+        p{
+            max-width: 390px;
+            margin-top: 0px;
+            margin-bottom: 25px;
+            font-size: 18px;
+        
+            line-height: 26px;
+        }
+    }
+
+    a {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    
+        font-size: 16px;
+        font-weight: 600;
+        line-height: 26px;
+    
+        padding: 11px 16px;
+        width: 286px;
+        background-color: #F07D3E;
+        border: 1px solid #F07D3E;
+        color: white;
+    
+        background: linear-gradient(to left, #F07D3E 50%, white 50%) right;
+        background-size: 200%;
+        transition: .3s ease-out;
+
+        &:hover {
+            background-color: white;
+            color: #F07D3E;
+            border: 1px solid #F07D3E;
+        
+            background-position: left;
+        }
+    }
+
+    img {
+        max-height: 476px;
+        max-width: auto;
+    }
+}
+
+.povezave_container {
+    max-width: 100%;
+    background-color: #FCFCFC;
+
+
+}
+
+.pomembne_povezave {
+    max-width: 1160px;
+    width: 95%;
+    padding-top: 110px;
+    padding-bottom: 105px;
+
+    margin: auto;
+}
+
+.povezave {
+    display: flex;
+    justify-content: space-between;
+
+    h2 {
+        font-style: normal;
+        font-weight: 700;
+        font-size: 18px;
+        line-height: 23px;
+    
+        margin-top: 25px;
+        margin-bottom: 8px;        
+    }
+
+    .col{
+
+        text-align: center;
+        max-width: min(254px,25%);
+    
+        flex: 1;
+        margin-right: 25px;
+
+        &:last-child{
+            margin-right: 0px;
+        }
+
+        p {
+            max-width: 253px;
+        
+            font-style: normal;
+            font-weight: 400;
+            font-size: 16px;
+            line-height: 26px;
+        
+            margin-top: 0px;
+            margin-bottom: 25px;   
+        }
+    }
+}
+
+.title {
+    font-style: normal;
+    font-weight: 400;
+    font-size: 32px;
+    line-height: 36px;
+
+    text-align: center;
+    margin-top: 0px;
+    margin-bottom: 70px;
+}
+
+.povezave_img{
+    height: 100px;
+    width: 100px;
+}
+
+@media screen and (max-width: 1000px) {
+    .povezave .col p {
+        min-height: 110px;
+        margin-bottom: 0px;
+    }
+}
+
+#povezave-btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    /* background-color: white; */
+    background-color: unset;
+    border: 1px solid #F07D3E;
+    color: #F07D3E;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 26px;
+
+    padding: 11px 16px;
+    margin: 0px auto;
+    max-width: 165px;
+    
+    background: linear-gradient(to left,#FCFCFC 50%, #F07D3E 50%) right;
+    background-size: 200%;
+    transition: .3s ease-out;
+    
+    &:hover {
+        color: white;
+        background-color: #F07D3E;
+    
+        border: 1px solid #F07D3E;
+    
+        background-position: left;
+    }
+} 
+
+
+footer {
+    padding-top: 105px;
+
+    h2 {
+        text-transform: uppercase;
+        font-weight: 700;
+        font-size: 18px;
+        line-height: 24px;
+    
+        margin: 0px;
+        padding-bottom: 12px;  
+    }
+
+    .footer_content {
+        max-width: 1160px;
+        width: 95%;
+        margin: auto;
+        padding: 0px;
+
+        .col {
+            max-width: 254px;
+
+            span {
+                font-weight: 400;
+                padding-top: 0px;
+                padding-bottom: 12px;
+
+                a {
+                    color: #343434;
+                }
+            }
+
+            .logo_holder {
+                margin: 0px;
+
+                img {
+                    margin-bottom: 25px;
+                    text-align: left;
+
+                    &.arnes-logo {
+                        max-width: 145px;
+                    }
+                }
+            }
+        }
+
+        .col1 .col1-flex {
+            display: flex;
+            flex-direction: column;
+        }
+
+        .col4 h2 {
+            padding-bottom: 24px;
+        }
+    }
+
+    .col a {
+        color: #343434;
+        font-size: 16px;
+        line-height: 26px;
+    }
+}
+
+.social_logo_flex img {
+    margin-right: 20px;
+    
+}
+
+.social_logo_flex img:hover {
+    opacity: 0.8;
+}
+
+.arnes-logo {
+    height: 45px;
+}
+
+
+
+/* GDPR ZAHTEVEK -------------------------------------- */
+
+body.gdpr {
+    line-height: 20px;
+}
+
+.gdpr #main .main_content {
+    padding: 0px;
+}
+
+ .register_holder{
+    max-width: 810px;
+    width: 95%;
+    margin: 70px auto 70px auto;
+
+    h1 {
+        font-size: 50px;
+        font-weight: 300;
+        line-height: 62px;
+    
+        margin: 20px 0px;
+    }
+
+    p {
+        font-weight: 400;
+        line-height: 26px;
+    
+        margin: 20px 0px;
+
+        a {
+            color: #1e88e5;
+        }
+    }
+}
+
+
+body.gdpr div.label {
+    display: block;
+    line-height: unset;
+    font-weight: 600;
+    width: 200px;
+
+    line-height: unset;
+
+}
+body #main .main_content .register_holder .label {
+    line-height: 20px;
+    padding-bottom: 4px;
+}
+
+body.gdpr .input_field div.label label {
+    line-height: unset;
+    padding-bottom: 4px;
+}
+
+
+.regfield {
+    height: 38px;
+    max-width: 245px;
+    width: 95%;
+    border: 1px solid #C4C4C4;
+    border-radius: 0px;
+
+    padding: 0px;
+    padding-left: 8px;
+    margin: 0px;
+}
+
+body .gdpr form p:first-of-type{
+    font-weight: 600;
+}
+
+body.gdpr div.input_field{
+    padding: 10px 0px;
+}
+/* Elektronski naslov:  */
+body.gdpr div.input_field:first-of-type {
+    padding-top: 0px;
+}
+/* URL ankete:  */
+body.gdpr div.input_field:nth-of-type(3){
+    padding-bottom: 0px;
+}
+
+/* Želim podati zahtevo za:  */
+form p:first-of-type {
+    margin: 20px 0px 6px 0px;
+}
+
+
+body.gdpr div.zahtevek {
+    padding: 6px 0px;
+}
+body.gdpr div.zahtevek:last-of-type {
+    padding-bottom: 0px;
+}
+
+body.gdpr div.zahtevek label input {
+    margin-right: 2px;
+    margin-left: 0px;
+    height: 18px;
+    width: 18px;
+
+    vertical-align: -1px;
+
+    border-radius: 0px;
+}
+
+
+/* tekst nad poljem za opis */
+form p:nth-of-type(2){
+    margin: 20px 0px;
+}
+form .opis {
+    font-weight: 600;
+
+    margin: 0px 0px 4px 0px;
+}
+
+#gdpr-note {
+    padding: 0px;
+    padding-left: 8px;
+    margin: 0px;
+    width: 100%;
+
+    border-radius: 0px;
+
+}
+
+.register_holder p:last-of-type {
+    margin: 18px 0px 20px 0px;
+    line-height: 26px;
+}
+
+
+input[type=submit],
+button,
+input[type=button],
+.button {
+    font-weight: 600;
+    font-size: 16px;
+    line-height: 26px;
+    height: 50px;
+    max-width: 320px;
+    width: 95%;
+    padding: 0px;
+
+    color: #FFFFFF;
+    background-color: #F07D3E;
+    border: 1px solid #F07D3E;
+
+    transition: .3s ease-out;
+
+    &:hover {
+        color: #F07D3E;
+        background-color: white;
+
+        border: 1px solid #F07D3E;
+    }
+}
+
+
+
+
+/* -------------------------------------- */
+
+@media screen and (max-width: 834px) {
+
+    header {
+        margin: none;
+
+        /* header - arnes logo fix */
+        .logo {
+            width: auto;
+        }
+    } 
+
+
+    .hero-container {
+        display: flex;
+        flex-direction: column-reverse;  
+        
+        
+        padding-top: 70px;
+        padding-bottom: 50px;
+
+        height: auto;
+
+        img {
+            max-width: 65%;
+        }
+
+        .text{
+            margin: auto;
+            text-align: center;
+
+            h1 {
+                margin-top: 50px;
+            }
+
+            p {
+                margin-bottom: 25px;
+                max-width: 390px;
+            }
+
+            a {
+                width: 80%;
+                max-width: 280px;
+                margin: auto;
+            }
+        }
+    }
+
+    .register_holder {
+        margin-top: 70px;
+        margin-bottom: 70px;
+    }
+
+    .pomembne_povezave {
+        padding-top: 68px;
+        padding-bottom: 70px;
+    }
+    
+    .povezave{
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+
+        row-gap: 30px;
+
+        .col  {
+            margin-top: 50px;
+            width: auto;
+            max-width: none; 
+
+            p {
+                max-width: 392px;
+                
+        
+                min-height: unset;
+                margin-bottom: 25px;
+            }
+        }
+
+        .col:last-child{
+            margin-right: 25px;
+        }
+    }
+
+    .title {
+        margin-bottom: 0px;    
+    }
+
+    #povezave-btn {
+        margin: 0px auto;
+    }
+
+    footer {
+        padding: 70px 0px 0px 0px;
+
+        .footer_content {
+            display: grid;
+            grid-template-columns: 1fr 1fr 1fr ;
+            grid-template-rows: 1fr 2fr;
+
+            .col{
+                max-width: 100%;
+                width: auto;     
+                
+                .logo_holder{
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between; 
+                    
+                    max-width: 100%;
+
+                    img{
+                        max-width: 33%;
+                        height: auto;
+                        margin: 0px;
+                    }
+                }
+            }
+
+            .col1  {
+                grid-row: 1/3;
+
+                .col1-flex {
+                    display: flex;
+                    flex-direction: column;
+                }
+            }
+
+            .col4  {
+                grid-column: 2/4;
+
+                h2 {
+                    padding-bottom: 12px;
+                }
+            }
+        }
+    }
+}
+
+
+@media screen and (max-width: 740px) {
+
+    body.landing_page #main .main_content {
+        padding: 0px;
+    }
+
+    body #main .main_content h1 {
+        font-size: 50px;
+    }
+
+    header .logo a img {
+        max-height: 29px;
+        max-width: 95px ;
+
+    }
+    header .logo a img:last-of-type{
+        margin-left: 12px;
+    }
+
+    .hero-container {
+        padding-top: 50px;
+
+        .text {
+            max-width: 100%;
+
+            a {
+                color: white;  
+
+                &:hover {
+                    width: 95%;
+                    border:  1px solid #F07D3E;
+                    color: #F07D3E;
+                    background-color: white;
+                }
+            }
+        }
+
+        img {
+            max-width: 80%;
+        }
+    }
+
+    .register_holder {
+        margin-top: 50px;
+        margin-bottom: 46px;
+    }
+    body #main .main_content .register_holder h1 {
+        text-align: unset;
+        padding: 0px;
+    }
+
+    .pomembne_povezave {
+        padding-top: 46px;
+        padding-bottom: 46px;
+    }
+
+    .title {
+        margin-bottom: 49px;
+        margin-top: 0px;
+    }
+
+    .povezave {
+        display: flex;
+        flex-direction: column;
+        
+        align-items: center;
+
+        .col {
+            margin: 50px 20px 20px 0px;  
+            
+            p {
+                min-height: unset;
+                
+            }
+        }
+    }
+
+    .povezave .col:nth-of-type(1),
+    .povezave .col:nth-of-type(3), 
+    .povezave .col:nth-of-type(2),
+    .povezave .col:nth-of-type(4) {
+        margin: auto;
+        margin-bottom: 30px;
+    }
+
+    .povezave .col:nth-of-type(4) {
+        margin-bottom: 0px;
+    }
+
+
+    /* --------------HAMBURGER---------------------------------- */
+    .nav-desktop {
+        display: none;  
+    }
+
+    .mobile {
+        display: block;
+    }
+
+    #nav-icon3 {
+        width: 38px;
+        height: 20px;
+        position: relative;
+
+        bottom: 15px;
+        
+        -webkit-transform: rotate(0deg);
+        -moz-transform: rotate(0deg);
+        -o-transform: rotate(0deg);
+        transform: rotate(0deg);
+        -webkit-transition: .5s ease-in-out;
+        -moz-transition: .5s ease-in-out;
+        -o-transition: .5s ease-in-out;
+        transition: .5s ease-in-out;
+        cursor: pointer;
+
+        span {
+            display: block;
+            position: absolute;
+            height: 5px;
+            width: 100%;
+            background: #F07D3E;
+            border-radius: 9px;
+            opacity: 1;
+            left: 0;
+            -webkit-transform: rotate(0deg);
+            -moz-transform: rotate(0deg);
+            -o-transform: rotate(0deg);
+            transform: rotate(0deg);
+            -webkit-transition: .25s ease-in-out;
+            -moz-transition: .25s ease-in-out;
+            -o-transition: .25s ease-in-out;
+            transition: .25s ease-in-out;
+        }
+        span:nth-child(1) {
+            top: 0px;
+        }
+        span:nth-child(2),
+        span:nth-child(3) {
+            top: 9px;
+        }
+        span:nth-child(4) {
+            top: 18px;
+        }
+    }
+      
+    #nav-icon3.open span:nth-child(1) {
+        top: 9px;
+        width: 0%;
+        left: 50%;
+    }
+      
+    #nav-icon3.open span:nth-child(2) {
+        -webkit-transform: rotate(45deg);
+        -moz-transform: rotate(45deg);
+        -o-transform: rotate(45deg);
+        transform: rotate(45deg);
+    }
+      
+    #nav-icon3.open span:nth-child(3) {
+        -webkit-transform: rotate(-45deg);
+        -moz-transform: rotate(-45deg);
+        -o-transform: rotate(-45deg);
+        transform: rotate(-45deg);
+    }
+      
+    #nav-icon3.open span:nth-child(4) {
+        top: 9px;
+        width: 0%;
+        left: 50%;
+    }
+
+    #links {
+        display: none;
+    }
+
+    /*  */
+    .aai a  {
+        color: #333333;
+    }
+      
+    #links.open {
+        position: absolute;
+        top: 100px;
+        left: 0px;
+
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        width: 100%;
+        height: 700px;
+        background-color: rgb(255, 255, 255);
+    }
+
+    #links .menu_item {
+        font-size: 30px;
+        margin-top: 30px;
+
+        a {
+            font-size: 16px;
+        }
+    }
+
+    
+    footer {
+        margin: 0px;
+        padding: 0px;
+        padding-top: 50px;
+
+        .footer_content {
+            /* background-color: rgb(184, 184, 184); */
+    
+            display: flex;
+            flex-direction: row;
+            flex-wrap: wrap; 
+    
+            padding: 0px 20px;
+
+            h2 {
+                padding-top: 12px;
+            }
+
+            .col {
+                /* border: 1px solid red; */
+                width: auto;
+                max-height: 180px;
+        
+                text-align: left;
+        
+                span {
+                    padding-bottom: 16px;
+                }
+
+                .logo_holder {
+                    flex-direction: column;
+                    justify-content: unset;
+
+                    img {
+                        max-width: unset;
+                        padding-bottom: 12px;
+                    }
+                }
+            }
+
+            .col1 .col1-flex{
+                display: flex;
+                flex-direction: column;
+                flex-wrap: wrap;
+        
+                max-height: 130px;
+            }
+            .col1{
+                max-width: 100%;
+                width: 100%;
+                /* border: 1px solid red; */
+        
+        
+            }
+            .col2,
+            .col3  {
+                max-width: 50%;
+                width: 50%;  
+            }
+        }
+    }
+}
+
+
+@media screen and (max-width: 700px){
+    body #main .main_content input[type=submit],
+    body #main .main_content input[type=button] {
+        display: block;
+        width: 100%;
+        margin: 20px 0px !important;
+      }
+}
+
+
+@media screen and (max-width: 365px) {
+
+    footer .footer_content {
+        flex-direction: column;
+        align-items: center;
+
+        padding: 0px;
+
+        .col {
+            max-height: unset;
+            text-align: center;
+
+            h2 {
+                text-align: center;
+            }
+        }
+
+        .col1 .col1-flex {
+            max-height: unset;
+    
+            align-items: center;
+        }
+
+        .col3 {
+            max-width: unset;
+            width: unset;
+
+            .social_logo_flex  {
+                padding-left: 10px;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/modules/aai.scss b/resources/sass/frontend_simple/modules/aai.scss
deleted file mode 100644
index 4011c2b1b..000000000
--- a/resources/sass/frontend_simple/modules/aai.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-body.landing_page,
-body.register,
-body.login,
-body.login_noEmail{
-
-    #content.aai #main{
-        min-height: auto;
-
-        background-image: url("../img/landing_page_image_aai.png");
-
-        .landing_page_window{
-            width: 500px;
-            padding: 50px;
-            margin-top: 70px;
-
-            text-align: center;
-
-            box-shadow: 1px 1px 4px 1px #999;
-
-            .app_title{
-                width: 500px;
-                margin: 0;
-
-                color: #333;
-            }
-
-            .arnes_logo{
-                margin: 30px 0;
-
-                img{
-                    width: 200px;
-                    height: auto;
-                }
-            }
-
-            .tab{
-                font-size: 16px;
-                text-transform: none;
-                line-height: 24px;
-            }
-
-            input[type="button"]{
-                width: auto;
-                padding: 18px 30px;
-                margin: 30px 0 10px 0;
-
-                font-weight: 600;
-                text-transform: none;
-
-                background-color: rgb(227, 82, 5);
-                border-radius: 5px;
-
-                &:hover{
-                    background-color: lighten(rgb(227, 82, 5), 10%);
-                }
-            }
-        }
-
-        .app_subtitle{
-            width: 500px;
-            margin: 10px auto;
-
-            color: #333;
-            font-size: 20px;
-            font-weight: 600;
-            text-shadow: none;
-        }
-    }
-}
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/modules/cookie.scss b/resources/sass/frontend_simple/modules/cookie.scss
index e57835bb0..18a7137ae 100644
--- a/resources/sass/frontend_simple/modules/cookie.scss
+++ b/resources/sass/frontend_simple/modules/cookie.scss
@@ -53,14 +53,3 @@
         }
     }
 }
-
-.aai .cookie_notice{
-
-    button{
-        background-color: #e35205;
-
-        &:hover{
-            background-color: #fa6c21;
-        }
-    }
-}
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/style.scss b/resources/sass/frontend_simple/style.scss
index 5ac53a437..7a312df58 100644
--- a/resources/sass/frontend_simple/style.scss
+++ b/resources/sass/frontend_simple/style.scss
@@ -23,9 +23,6 @@
 @import "./modules/landing_page.scss";
 @import "./modules/pages.scss";
 
-// AAI
-@import "./modules/aai.scss";
-
 
 // Mobile popravki
 @import "./basic/mobile.scss";