diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index c9d17ecc4..825f2eb0c 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1955,49 +1955,25 @@ class SurveyAdminSettings {
 			// Številčenje vprašanj (default da)
 			$export_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_numbering');
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title" >'.$lang['srv_nastavitveStevilcenje'].':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_numbering" id="export_numbering_1" '.($export_numbering==='1'?' checked':'').' value="1">';
-			echo '<label for="export_numbering_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_numbering" id="export_numbering_0" '.($export_numbering!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_numbering_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-
+			echo '<input type="hidden" name="export_numbering" value="0">';
+            echo '<input type="checkbox" id="export_numbering" name="export_numbering" value="1" '.($export_numbering==='1'?' checked':'').'>';
+            echo '<label for="export_numbering">'. $lang['srv_nastavitveStevilcenje'] .'</label> ';
 			echo '</div>';
 
 			// Prikaz pogojev (default da)
 			$export_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_show_if');
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title" >'.$lang['srv_export_if'].':</span>';
-
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_if" id="export_show_if_1" '.($export_show_if==='1'?' checked':'').' value="1">';
-			echo '<label for="export_show_if_1">'.$lang['yes'].'</label>';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_if" id="export_show_if_0" '.($export_show_if!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_show_if_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-								
+			echo '<input type="hidden" name="export_show_if" value="0">';
+            echo '<input type="checkbox" id="export_show_if" name="export_show_if" value="1" '.($export_show_if==='1'?' checked':'').'>';
+            echo '<label for="export_show_if">'. $lang['srv_export_if'] .'</label> ';
 			echo '</div>';
 
 			// Prikazi uvoda (default ne)
 			$export_show_intro = SurveySetting::getInstance()->getSurveyMiscSetting('export_show_intro');
 			echo '<div class="setting_holder">';
-			echo '<span class="setting_title" >'.$lang['srv_export_intro'].':</span>';
-			
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_intro" id="export_show_intro_1" '.($export_show_intro==='1'?' checked':'').' value="1">';
-			echo '<label for="export_show_intro_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_show_intro" id="export_show_intro_0" '.($export_show_intro!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_show_intro_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
+			echo '<input type="hidden" name="exporexport_show_introt_show_if" value="0">';
+            echo '<input type="checkbox" id="export_show_intro" name="export_show_intro" value="1" '.($export_show_intro==='1'?' checked':'').'>';
+            echo '<label for="export_show_intro">'. $lang['srv_export_intro'] .'</label> ';
 			echo '</div>';
 
 			echo '</fieldset>';
@@ -2007,113 +1983,76 @@ class SurveyAdminSettings {
 			echo '<fieldset>';	
 			echo '<legend>'.$lang['srv_export_results_settings'].'</legend>';
 
+
+			// Številčenje vprašanj (default da)
+			$export_data_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_numbering');
 			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_numbering" value="0">';
+            echo '<input type="checkbox" id="export_data_numbering" name="export_data_numbering" value="1" '.($export_data_numbering==='1'?' checked':'').'>';
+            echo '<label for="export_data_numbering">'. $lang['srv_nastavitveStevilcenje'] .'</label> ';
+			echo '</div>';
+
+			
+			// Prikaz recnuma (default da)
+			$export_data_show_recnum = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_recnum');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_show_recnum" value="0">';
+            echo '<input type="checkbox" id="export_data_show_recnum" name="export_data_show_recnum" value="1" '.($export_data_show_recnum==='1'?' checked':'').'>';
+            echo '<label for="export_data_show_recnum">'. $lang['srv_export_show_recnum'] .'</label> ';
+			echo '</div>';
+			
+
+			// Prikaz pogojev (default da)
+			$export_data_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_if');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_show_if" value="0">';
+            echo '<input type="checkbox" id="export_data_show_if" name="export_data_show_if" value="1" '.($export_data_show_if==='1'?' checked':'').'>';
+            echo '<label for="export_data_show_if">'. $lang['srv_export_if'] .'</label> ';
+			echo '</div>';
+
+			
+			// Page break med posameznimi respondenti (default ne)
+			$export_data_PB = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_PB');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_PB" value="0">';
+            echo '<input type="checkbox" id="export_data_PB" name="export_data_PB" value="1" '.($export_data_PB==='1'?' checked':'').'>';
+            echo '<label for="export_data_PB">'. $lang['srv_export_pagebreak'] .'</label> ';
+			echo '</div>';
+
+			
+			// Izpusti vprasanja brez odgovora (default ne)
+			$export_data_skip_empty = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_skip_empty" value="0">';
+            echo '<input type="checkbox" id="export_data_skip_empty" name="export_data_skip_empty" value="1" '.($export_data_skip_empty==='1'?' checked':'').'>';
+            echo '<label for="export_data_skip_empty">'. $lang['srv_export_skip_empty'] .'</label> ';
+			echo '</div>';
+			
+
+			// Izpusti podvprasanja brez odgovora (default ne)
+			$export_data_skip_empty_sub = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty_sub');
+			echo '<div class="setting_holder">';
+			echo '<input type="hidden" name="export_data_skip_empty_sub" value="0">';
+            echo '<input type="checkbox" id="export_data_skip_empty_sub" name="export_data_skip_empty_sub" value="1" '.($export_data_skip_empty_sub==='1'?' checked':'').'>';
+            echo '<label for="export_data_skip_empty_sub">'. $lang['srv_export_skip_empty_sub'] .'</label> ';
+			echo '</div>';
 
 			// Tip izvoza (1->dolg oz. razsirjen, 2->kratek oz. skrcen)
+			echo '<div class="setting_holder">';
 			$export_data_type = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_type');
 			echo '<label for="export_data_type">'.$lang['srv_displaydata_type'];
 			echo Help :: display('displaydata_pdftype');
 			echo ':</label>';
-			echo '<select name="export_data_type" id="export_data_type" class="dropdown large">';
-			echo '	<option value="2"'.((int)$export_data_type == 2 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type2'] . '</option>';
-			echo '	<option value="1"'.((int)$export_data_type == 1 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type1'] . '</option>';
-			echo '</select>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_data_type" id="export_data_type2" '.((int)$export_data_type == 2 ? ' checked':'').' value="2">';
+			echo '<label for="export_data_type2">'.$lang['srv_displaydata_type2'].'</label> ';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_data_type" id="export_data_type1" '.((int)$export_data_type == 1 ?' checked':'').' value="1">';
+			echo '<label for="export_data_type1">'.$lang['srv_displaydata_type1'].'</label> ';
 			echo '</div>';
 
-			echo '<div class="setting_holder">';
-			
-			// Številčenje vprašanj (default da)
-			$export_data_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_numbering');
-			echo '<span class="setting_title" >'.$lang['srv_nastavitveStevilcenje'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_numbering" id="export_data_numbering_1" '.($export_data_numbering==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_numbering_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_numbering" id="export_data_numbering_0" '.($export_data_numbering!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_numbering_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
-			echo '<div class="setting_holder">';
-			
-			// Prikaz recnuma (default da)
-			$export_data_show_recnum = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_recnum');
-			echo '<span class="setting_title" >'.$lang['srv_export_show_recnum'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_recnum" id="export_data_show_recnum_1" '.($export_data_show_recnum==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_show_recnum_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_recnum" id="export_data_show_recnum_0" '.($export_data_show_recnum!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_show_recnum_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-			
-			echo '<div class="setting_holder">';
-
-			// Prikaz pogojev (default da)
-			$export_data_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_if');
-			echo '<span class="setting_title" >'.$lang['srv_export_if'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_if" id="export_data_show_if_1" '.($export_data_show_if==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_show_if_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_show_if" id="export_data_show_if_0" '.($export_data_show_if!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_show_if_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
-			echo '<div class="setting_holder">';
-			
-			// Page break med posameznimi respondenti (default ne)
-			$export_data_PB = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_PB');
-			echo '<span class="setting_title" >'.$lang['srv_export_pagebreak'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_PB" id="export_data_PB_1" '.($export_data_PB==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_PB_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_PB" id="export_data_PB_0" '.($export_data_PB!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_PB_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-
-			echo '<div class="setting_holder">';
-			
-			// Izpusti vprasanja brez odgovora (default ne)
-			$export_data_skip_empty = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty');
-			echo '<span class="setting_title" >'.$lang['srv_export_skip_empty'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty" id="export_data_skip_empty_1" '.($export_data_skip_empty==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_skip_empty_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty" id="export_data_skip_empty_0" '.($export_data_skip_empty!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_skip_empty_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
-			echo '</div>';
-			
-			echo '<div class="setting_holder">';
-
-			// Izpusti podvprasanja brez odgovora (default ne)
-			$export_data_skip_empty_sub = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty_sub');
-			echo '<span class="setting_title" >'.$lang['srv_export_skip_empty_sub'].':</span>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty_sub" id="export_data_skip_empty_sub_1" '.($export_data_skip_empty_sub==='1'?' checked':'').' value="1">';
-			echo '<label for="export_data_skip_empty_sub_1">'.$lang['yes'].'</label> ';
-			echo '</div>';
-			echo '<div class="setting_item">';
-			echo '<input type="radio" name="export_data_skip_empty_sub" id="export_data_skip_empty_sub_0" '.($export_data_skip_empty_sub!=='1'?' checked':'').' value="0">';
-			echo '<label for="export_data_skip_empty_sub_0">'.$lang['no'].'</label> ';
-			echo '</div>';
-			
 			echo '</div>';
 				
 			echo '</fieldset>';
diff --git a/lang/1.php b/lang/1.php
index 4312bc4c1..9c8c15651 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4606,9 +4606,9 @@ $lang = array (
 	"srv_export_questionnare_2"					=>	"Pozor: pri večjih anketah zaradi obsežnosti tovrsten izpis morda ni smiselen! Za več kot 300 izpisov morate zato imeti status administratorja.",
 	//"srv_export_pagebreak"						=>	"Vsak respondent na novi strani",
 	"srv_export_pagebreak"						=>	"Vsak respondent na novi strani (le za PDF)",
-	"srv_export_if"								=>	"Prikaz if-ov",
+	"srv_export_if"								=>	"Prikaz pogojev (IF)",
 	"srv_export_font"							=>	"Velikost pisave (le za PDF)",
-	"srv_export_show_recnum"					=>	"Prikaz recnuma",
+	"srv_export_show_recnum"					=>	"Prikaz recnuma oz. zaporedne številke respondenta",
 	"srv_export_results_settings"				=>	"Izpis odgovorov respondentov",
 	"srv_export_survey_settings"				=>	"Izpis vprašalnika",
 	"srv_export_intro"							=>	"Prikaz uvoda",
diff --git a/lang/2.php b/lang/2.php
index 0ab75b23b..0c653dcda 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4582,9 +4582,9 @@ $lang = array (
 	"srv_export_questionnare_2"					=>	"Warning: Export for survey with more than 300 respondents is possible only for administrators!",
 	//"srv_export_pagebreak"						=>	"Every respondent starts with a new page",
 	"srv_export_pagebreak"						=>	"Every respondent starts with a new page (PDF only)",
-	"srv_export_if"								=>	"Show if clauses",
+	"srv_export_if"								=>	"Show conditions (IF)",
 	"srv_export_font"							=>	"Font size (PDF only)",
-	"srv_export_show_recnum"					=>	"Show recnum",
+	"srv_export_show_recnum"					=>	"Show recnum (respondent's consecutive number)",
 	"srv_export_results_settings"				=>	"Answers export",
 	"srv_export_survey_settings"				=>	"Survey export",
 	"srv_export_intro"							=>	"Show intro",