diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 6cfe45ef7..3cb8a0c09 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -9299,6 +9299,8 @@ class SurveyAdminSettings {
 		echo '<span class="nastavitveSpan6">'.$lang['srv_api_auth'].': </span>';
 		echo '<a href="#" onClick="generate_API_key(); return false;">'.$lang['srv_api_auth2'].'</a>';
 		echo '<br /><br />';
+
+        echo $lang['additional_info_api'];
 		
 		echo '</fieldset>';
 		
@@ -9507,10 +9509,9 @@ class SurveyAdminSettings {
 		// Save gumb - ce ni AAI
         if(!$aai_instalacija){
 
+            echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_gray" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>';
             echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="save1kaRacunSettings();"><span>'.$lang['edit1337'] . '</span></a></div>';
 
-            echo '  <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>';
-
             echo '<span class="clr"></span>';
             
             // div za prikaz uspešnosti shranjevanja
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 7babe6916..224ced5f2 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -1541,7 +1541,7 @@ class SurveyList {
 			$this->displayNewSurveyList($folder['id']);
 			
 			// Izpisemo se vse folderje znotraj trenutnega folderja
-			$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' AND parent='".$folder['id']."' ORDER BY naslov ASC");
+			$sql = sisplet_query("SELECT * FROM srv_mysurvey_folder WHERE usr_id='$global_user_id' AND parent='".$folder['id']."' ORDER BY id DESC");
 			if(mysqli_num_rows($sql) > 0) {								
 				while($row = mysqli_fetch_array($sql)){
 					echo '<div id="folder_holder_'.$row['id'].'" class="folder_holder">';
diff --git a/lang/1.php b/lang/1.php
index 5f685a3f7..577fa6502 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -234,7 +234,7 @@ $lang = array (
 	"mail_forgot_password"		=>		"Po&#353;iljamo vam pozabljeno geslo za administracijo. Va&#353;i podatki:",
 	"byebye"			=>		"Lep pozdrav",
 	"forgotten_password"		=>		"Pozabljeno geslo",
-	"edit_menu"			=>		"Menu",
+	"edit_menu"			    =>		"Menu",
 	"edit_menu_up" 			=>		"Nadmenu",
 	"edit_header"			=>		"Naslov",
 	"edit_short_header"		=>		"Kratek naslov",
@@ -7420,6 +7420,8 @@ $lang = array (
 	'srv_export_no_chart' => "Ni ustreznega grafa za prikazovanje",
 	'srv_export_2_xls_button' => "Izvozi v Excel",
 	'srv_pc_unavailable' => "Prikaz slike ni mogoč",
+    "additional_info_api"       =>      "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><span class=\"bold\">Dodatne informacije</span></a>",
+
     
 
     // SQUALO //
@@ -7431,8 +7433,8 @@ $lang = array (
     // NAROCILA //
     'srv_narocila'          => "Naročila",
     'srv_narocila_my'       => "Moja naročila",
-    'srv_narocila_buy'      => "Nakup paketa",
-    'srv_narocila_extend'   => "Podaljšanje paketa",
+    'srv_narocila_buy'      => "Nadgradite paket",
+    'srv_narocila_extend'   => "Podaljšajte paket",
     'srv_narocila_edit'     => "Uredi naročilo",
     'srv_narocila_delete'   => "Pobriši naročilo",
     'srv_narocila_list'     => "Seznam vseh naročil",
diff --git a/lang/2.php b/lang/2.php
index ab682b0ef..d3ef4486f 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7305,6 +7305,8 @@ $lang = array (
 	'srv_export_respondent_data_heatmap_regions_number' => "Number of clicks inside region",
 	'srv_export_2_xls_button' => "Export to Excel",
 	'srv_pc_unavailable' => "Image unavailable",
+    "additional_info_api"       =>      "<a href=\"https://www.1ka.si/d/en/about/1ka-api\" target=\"_blank\"><span class=\"bold\">Additional information</span></a>",
+
 	
 
 
@@ -7318,7 +7320,7 @@ $lang = array (
     // NAROCILA //
     'srv_narocila'          => "Orders",
     'srv_narocila_my'       => "My orders",
-    'srv_narocila_buy'      => "Buy package",
+    'srv_narocila_buy'      => "Upgrade package",
     'srv_narocila_extend'   => "Extend package",
     'srv_narocila_edit'     => "Edit order",
     'srv_narocila_delete'   => "Delete order",