diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index fc6a919ee..5642bed3a 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -117,6 +117,12 @@ class SurveyAdminSettings {
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="opomba" value="0">';
+            echo '<input type="checkbox" id="opomba" name="opomba" value="1" '.(isset($row['intro_opomba']) && $row['intro_opomba'] != ""  ? ' checked="checked"' : '').' onChange="toggleAnketaOpomba(); return false;">';
+            echo '<label for="opomba">'.$lang['srv_dodaj_opombo'].'</label> ';
+			echo '</div>';
+
+			echo '<div id="dodaj-opombo" class="setting_holder '.(isset($row['intro_opomba']) && $row['intro_opomba'] != ""  ? '' : 'displayNone').'">';
 			echo '  <label for="anketa_note">'.$lang['srv_note'].':</label>';
 			echo '  <textarea id="anketa_note" name="intro_opomba" maxlength="'.ANKETA_NOTE_MAXLENGTH.'">' . $row['intro_opomba'] . '</textarea>';
 			echo '  <span class="charalimit" id="anketa_note_chars";">' . strlen($row['intro_opomba']) . '/'.ANKETA_NOTE_MAXLENGTH.'</span>';
@@ -136,7 +142,13 @@ class SurveyAdminSettings {
 			$sqlF = sisplet_query("SELECT id, naslov FROM srv_mysurvey_folder WHERE usr_id='".$global_user_id."' ORDER BY naslov ASC");	
 			if($show_folders == 1 && mysqli_num_rows($sqlF) > 0){
 
-				echo '<div class="setting_holder">';
+				echo '<div id="anketa-toggle" class="setting_holder '.($selected_folder != 0 ? '' : 'bottom0').'">';
+				echo '<input type="hidden" name="mapa" value="0">';
+				echo '<input type="checkbox" id="mapa" name="mapa" value="1" '.($selected_folder != 0 ? ' checked="checked"' : '').' onChange="toggleAnketaMapa(); return false;">';
+				echo '<label for="mapa">'.$lang['srv_newSurvey_survey_new_folder'].'</label> ';
+				echo '</div>';
+
+				echo '<div id="dodaj-v-mapo"  class="setting_holder '.($selected_folder != 0 ? '' : 'displayNone').'">';
 				echo '<label for="anketa_folder">'. $lang['srv_newSurvey_survey_new_folder'] .Help::display('srv_nova_shrani').':</label>';
 				echo '<select class="dropdown large w400" name="anketa_folder" id="anketa_folder">';
 				echo '<option value="0" '.($selected_folder == 0 ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
@@ -194,6 +206,7 @@ class SurveyAdminSettings {
 			
 			echo '</div>';
 
+			echo '<div class="setting_horizontal_wrapper">';
 			echo '<div class="setting_holder">';
 			echo '<label for="lang_resp">'.$lang['srv_language_respons_1'].':</label>';
 
@@ -204,28 +217,28 @@ class SurveyAdminSettings {
 				echo '<option value="'.$key.'" '.($key==$lang_resp?' selected':'').'>'.$val.'</option>'; 
 			}
 			echo '</select>';
-
 			echo '</div>';
-            
-            // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
+
 
 			// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
             $userAccess = UserAccess::getInstance($global_user_id);
             if($userAccess->checkUserAccess($what='prevajanje')){
 
 				$lang_link = 'window.location.href=\'index.php?anketa='.$this->anketa.'&a=prevajanje\'; return false;';
-				$color = 'white-blue';
+				$color = 'white-black';
             }
             else{  
 				$lang_link = 'popupUserAccess(\'prevajanje\'); return false;';
 				$color = 'yellow user_access_locked';          
             }	
 
-			echo '<div class="button_holder top16 bottom0">';
+			echo '<div class="button_holder top0 bottom0">';
 			echo '<button class="medium '.$color.'" onClick="'.$lang_link.'">'.$lang['srv_multi_lang'].'</button>';				
 			echo '</div>';
 
-			
+
+			echo '</div>';
+            
 			echo '</fieldset>';
 
 			// Gumb shrani - vmes
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index b070cbcee..a20a09007 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5730,4 +5730,13 @@ function toggleCommentPopupInline ($type) {
 	if ($type==1) // dodaj komentar
 		$("#comment_inline_add").toggleClass('displayNone');
 	
+}
+
+function toggleAnketaOpomba () {
+	$("#dodaj-opombo").toggleClass('displayNone');
+}
+
+function toggleAnketaMapa () {
+	$("#dodaj-v-mapo").toggleClass('displayNone');
+	$("#anketa-toggle").toggleClass('bottom0');
 }
\ No newline at end of file
diff --git a/lang/1.php b/lang/1.php
index bec34cad4..6a6ed5a32 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1854,6 +1854,7 @@ $lang = array (
 	"srv_osnovniPodatki"	=>	"Osnovni podatki",
 	"srv_osnovniPodatki2"	=>	"Osnovne nastavitve",
 	"srv_novaanketa_kratkoime"		=>	"Objavljeno ime ankete",
+	"srv_dodaj_opombo"		=>	"Dodaj opombo na anketo",
 	"srv_novaanketa_kratkoime_info" =>	 "(Akronim ankete, do 40 znakov)",
 	"srv_novaanketa_polnoime"		=>	"Interno ime ankete",
 	"srv_novaanketa_ime_respondenti"=>	"Ime ankete za respondente",
diff --git a/lang/2.php b/lang/2.php
index b09c0de74..c24c62513 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1837,6 +1837,7 @@ $lang = array (
 	"srv_osnovniPodatki"			=>	"Basic info",
 	"srv_osnovniPodatki2"			=>	"Basic settings",
 	"srv_novaanketa_kratkoime"		=>	"Published survey name",
+	"srv_dodaj_opombo"		=>	"Dodaj opombo na anketo",
 	"srv_novaanketa_kratkoime_info" =>  "(40 chars)",
 	"srv_novaanketa_polnoime"		=>	"Internal survey name",
 	"srv_novaanketa_ime_respondenti"=>	"Survey name for respondents",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d00450472..858c5353e 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9836,9 +9836,18 @@ fieldset legend {
 fieldset .setting_horizontal_wrapper {
   display: flex;
   flex-direction: row;
+  margin-bottom: 16px;
 }
 fieldset .setting_horizontal_wrapper .setting_holder {
-  margin-right: 17px;
+  margin-right: 16px;
+  margin-bottom: 0;
+}
+fieldset .setting_horizontal_wrapper .button_holder {
+  height: 40px;
+  align-self: flex-end;
+}
+fieldset .setting_horizontal_wrapper:last-of-type {
+  margin-bottom: 0px;
 }
 fieldset .setting_holder {
   margin-bottom: 16px;
diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss
index e82ce1398..3be6bc427 100644
--- a/resources/sass/admin_new/components/form/fieldset.scss
+++ b/resources/sass/admin_new/components/form/fieldset.scss
@@ -23,7 +23,18 @@ fieldset{
         flex-direction: row;
 
         .setting_holder {
-            margin-right: 17px;
+            margin-right: 16px;
+            margin-bottom: 0;
+        }
+
+        .button_holder {
+            height: 40px;
+            align-self: flex-end;
+        }
+
+        margin-bottom: 16px;
+        &:last-of-type {
+            margin-bottom: 0px;
         }
     }