diff --git a/admin/survey/classes/class.SurveyAppendMerge.php b/admin/survey/classes/class.SurveyAppendMerge.php
index 414c354db..85d2ad738 100644
--- a/admin/survey/classes/class.SurveyAppendMerge.php
+++ b/admin/survey/classes/class.SurveyAppendMerge.php
@@ -380,8 +380,7 @@ class SurveyAppendMerge {
 		$do_merge = (int)$_POST['do_merge'];
 		$import_type = (int)$_POST['inv_import_type'];
 		if ($_POST['do']=='1') $do = true; else $do = false;
-		
-		
+
 		// ce uploadamo datoteko
 		if ($import_type == 1) {
 			
@@ -444,6 +443,7 @@ class SurveyAppendMerge {
 			// napaka
 			if ($result <= 0) {
 				echo '<h2>'.$lang['error'].'</h2>';
+				echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
 				
 				if ($result < 0)
 					echo '<p>'.$output.'</p>';
@@ -457,6 +457,7 @@ class SurveyAppendMerge {
 			} else {
 								
 				echo '<h2>'.$lang['srv_potrditev'].'</h2>';
+				echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
 				
 				if ($do_merge == 0)
 					echo '<p>'.$lang['srv_append-merge_process_1'].' '.$result.' '.$lang['srv_append-merge_process_2'].'. '.'</p>';
@@ -474,11 +475,13 @@ class SurveyAppendMerge {
 		} else {
 			
 			echo '<h2>'.$lang['fin_import_ok'].'</h2>';
+			echo '<div class="popup_close"><a href="#" onClick="append_submit_close(); return false;"">✕</a></div>';
 			
 			echo '<p>'.$output.'</p>';
 			echo '<p>'.$lang['srv_append-merge_fin'].'</p>';
 
 			echo '<div class="button_holder">';
+			echo '<button class="medium white-blue" onclick="append_submit_close(); return false;">'.$lang['back'].'</button>';
 			echo '<button class="medium blue" onclick="window.location.href=\'index.php?anketa='.$this->anketa.'&a=data'.(count($this->usr_ids) < 100?'&highlight_usr='.implode('-', $this->usr_ids).'':'').'\'">'.$lang['data_show'].'</button>';
 			echo '</div>';
 		}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index ce594df60..b3a9c3afd 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -15471,6 +15471,9 @@ div.appendmerge_indent ul {
   margin: 0;
   list-style-position: inside;
 }
+div.appendmerge_indent ul li.inv_field_enabled label {
+  cursor: default;
+}
 div.appendmerge_indent div.setting_holder input[type=number] {
   border: 1px solid #C4C4C4;
   box-sizing: border-box;
@@ -15519,7 +15522,7 @@ div.appendmerge_indent div.setting_holder input[type=number]:focus {
   min-width: 200px;
   box-sizing: border-box;
   padding: 12px 16px;
-  margin: 8px;
+  margin: 4px;
   text-align: left;
   vertical-align: middle;
   background-color: #F8F8F8;
diff --git a/resources/sass/admin_new/pages/survey_data/append_merge.scss b/resources/sass/admin_new/pages/survey_data/append_merge.scss
index 9f4a90bd8..752272308 100644
--- a/resources/sass/admin_new/pages/survey_data/append_merge.scss
+++ b/resources/sass/admin_new/pages/survey_data/append_merge.scss
@@ -9,6 +9,12 @@ div.appendmerge_indent{
 		padding: 0;
 		margin: 0;
 		list-style-position: inside;
+
+		li.inv_field_enabled {
+			label {
+				cursor: default;
+			}
+		}
 	}
 
 	div.setting_holder {
@@ -73,7 +79,7 @@ div.appendmerge_indent{
             
             box-sizing: border-box;
 			padding: 12px 16px;
-			margin: 8px;
+			margin: 4px;
 
 			text-align: left;
 			vertical-align: middle;