diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 65dc5d6c1..8d8745864 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4704,15 +4704,29 @@ class SurveyAdminSettings {
 		
 			echo '<fieldset><legend>'.$lang['srv_lnk_excel'].'</legend>';
 		
-			echo $lang['srv_izvoz_Excel_note'];	
-			echo $lang['srv_izvoz_Excel_note_2'];
+			echo $lang['srv_izvoz_Excel_note_a'];
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onclick="doExcelExport(); return false;">'.$lang['srv_izvoz_Excel_file'].'</button>';              
+            echo '</div>';
+			echo '<p class="top16">'.$lang['srv_izvoz_Excel_note_b'].'</p>';
 			
-			echo '<p class="strong">'.$lang['srv_izvoz_Excel_settings'].'</p>';
-			echo '<p>';
-			echo '<label>'.$lang['srv_expor_excel_cell_delimiter'].'</label>';			
-			echo '<label><input type="radio" name="export_delimit" id="export_delimit_semicolon" value="0" onchange="excelExportChangeDelimit(); return false;" checked="checked"/>'.$lang['srv_expor_excel_cell_delimiter1'].'</label>';
-			echo '<label><input type="radio" name="export_delimit" id="export_delimit_coma" value="1" onchange="excelExportChangeDelimit(); return false;"/>'.$lang['srv_expor_excel_cell_delimiter2'].'</label>';
-			echo '</p>';
+			echo '<p class="top16 bottom16">'.$lang['srv_izvoz_Excel_note_2'].'</p>';
+			
+			echo '<div class="setting_holder">';
+			echo '<span class="setting_title">'.$lang['srv_expor_excel_cell_delimiter'].'</span>';
+
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_delimit" id="export_delimit_semicolon" value="0" onchange="excelExportChangeDelimit(1); return false;" checked="checked"/>';
+			echo '<label for="export_delimit_semicolon">'.$lang['srv_expor_excel_cell_delimiter1'].'</label>';
+			echo '</div>';
+			echo '<div class="setting_item">';
+			echo '<input type="radio" name="export_delimit" id="export_delimit_coma" value="1" onchange="excelExportChangeDelimit(2); return false;"/>';
+			echo '<label for="export_delimit_coma">'.$lang['srv_expor_excel_cell_delimiter2'].'</label>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="setting_holder">';
 			
 			echo '<p>';
 			echo '<div id="replace_export_delimit_semicolon">';
@@ -4728,10 +4742,13 @@ class SurveyAdminSettings {
 			echo '</span>';			
 			echo '</div>';
 			echo '</p>';
+			echo '</div>';
 
-			echo '<p>';	
-			echo '<label><input type="checkbox" name="export_labels" id="export_labels" checked="checked" value="1"/>'.$lang['srv_export_texts'].'</label>';
-			echo '<p>';
+
+			echo '<div class="setting_holder">';
+			echo '<input type="checkbox" name="export_labels" id="export_labels" checked="checked" value="1"/>';
+			echo '<label for="export_labels">'.$lang['srv_export_texts'].'</label>';
+			echo '</div>';
 			
 			echo '</fieldset>';
 			
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index 584fea6e8..2b3dc503f 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -3767,9 +3767,16 @@ function doExcelExport() {
 	//return false;
 	*/
 }
-function excelExportChangeDelimit() {
-	$('#replace_export_delimit_semicolon').toggle();
-	$('#replace_export_delimit_comma').toggle();
+function excelExportChangeDelimit($param) {
+	if ($param == 1) {
+		$('#replace_export_delimit_semicolon').removeClass('displayNone');
+		$('#replace_export_delimit_comma').addClass('displayNone');
+	}
+	else if ($param == 2) {
+		$('#replace_export_delimit_semicolon').addClass('displayNone');
+		$('#replace_export_delimit_comma').removeClass('displayNone');
+	}
+	
     return false;
 }
 
diff --git a/lang/1.php b/lang/1.php
index 26b5a13a2..860195d10 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1581,8 +1581,10 @@ $lang = array (
 	"srv_izvoz_step5"		=>	"5. korak:",
 	"srv_izvoz_Excel_xls_note"		=>	"<p>Podatke v Excel (xls) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelXlsExport(); return false;\" ><span class=\"bold\">\"Izvoz v Excel\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
 	"srv_izvoz_Excel_xls_note_2"	=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\"https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",	
-	"srv_izvoz_Excel_note"			=>	"<p>Podatke v CSV (comma separated values) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doExcelExport(); return false;\" ><span class=\"bold\">\"Izvoz v CSV\"</span></a>.</p><p>V Excel verzije 2003 ali starej&#353;e je mo&#382;en izvoz najve&#269; 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.</p>",
-	"srv_izvoz_Excel_note_2"		=>	"<p>Opozorilo! Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\"><span class=\"bold\">Težave pri izvozu v Excel</span></a>.</p>",
+	"srv_izvoz_Excel_note_a"			=>	"Podatke v CSV (angl. <span class=\"italic\">comma separated values</span>) izvozite s klikom na spodnji ukaz:",
+	"srv_izvoz_Excel_file"			=>	"Izvoz v CSV",
+	"srv_izvoz_Excel_note_b"			=>	"V Excel verzije 2003 ali starejše je možen izvoz največ 256-ih stolpcev (spremenljivk). Morebitni nadaljnji stolpci se ne bodo izvozili. Ta omejitev je odpravljena v verziji 2007.",
+	"srv_izvoz_Excel_note_2"		=>	"<span class=\"red\">Opozorilo!</span> Pri izvozu v Excel (Microsoft Excel verzija 2007 in novejše) se odprti odgovori ne izpišejo v celoti. Rešitev takšne težave in vseh težav z Excelom si lahko pogledate v pomoči <a href=\" https://www.1ka.si/db/19/430/Pogosta%20vprasanja/Tezave_pri_izvozu_v_Excel/\" target=\"_blank\">Težave pri izvozu v Excel</a>.",
 	"srv_izvoz_Excel_settings"		=>	"Nastavitve",
 	"srv_izvoz_SPSS_note"			=>	"Podatke vaše ankete izvozite v SPSS/PASW v petih kratkih korakih:",		
 	"srv_izvoz_step1_SPSS"			=>	"Naprej s klikom spodaj shranimo datoteko s podatki (format .txt) v izbrano mapo:",
diff --git a/lang/2.php b/lang/2.php
index ccc460939..7f813d3e1 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1569,8 +1569,10 @@ $lang = array (
 	"srv_izvoz_step5"		=>	"Step 5:",
 	"srv_izvoz_Excel_xls_note"		=>	"<p>Export data to Excel (xls) by clicking on the <a href=\"#\" onclick=\"doExcelXlsExport(); return false;\" ><span class=\"bold\">\"Export to Excel\"</span></a> option.</p><p>Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.</p>",
 	"srv_izvoz_Excel_xls_note_2"	=>	"<p>Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this <a href=\"https://www.1ka.si/d/en/help/faq/export-to-excel-why-are-answers-incomplete-when-i-export-the-data-to-excel\" target=\"_blank\"><span class=\"bold\">manual</span></a>.</p>",		
-	"srv_izvoz_Excel_note"			=>	"<p>Export data to CSV (comma separated values) by clicking on the <a href=\"#\" onclick=\"doExcelExport(); return false;\" ><span class=\"bold\">\"Export to CSV\"</span></a> option.</p><p>Excel versions 2003 and older support export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.</p>",
-	"srv_izvoz_Excel_note_2"		=>	"<p>Warning! While exporting into Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this <a href=\"https://www.1ka.si/d/en/help/faq/export-to-excel-why-are-answers-incomplete-when-i-export-the-data-to-excel\" target=\"_blank\"><span class=\"bold\">manual</span></a>.</p>",	
+	"srv_izvoz_Excel_note_a"			=>	"Export data to CSV (comma separated values) by clicking the button below:",
+	"srv_izvoz_Excel_file"			=>	"CSV file export",
+	"srv_izvoz_Excel_note_b"			=>	"Excel versions 2003 and older support the export of maximum of 256 columns. Any subsequent columns will not be exported. This limitation is resolved in version 2007.",
+	"srv_izvoz_Excel_note_2"		=>	"<span class=\"red\">Warning!</span> When exporting to Excel (Microsoft Excel 2007 or newer), open answers are not exported in their entirety. This can be resolved by following the instructions outlined in this <a href=\"https://www.1ka.si/d/en/help/faq/export-to-excel-why-are-answers-incomplete-when-i-export-the-data-to-excel\" target=\"_blank\">manual</a>.",	
 	"srv_izvoz_Excel_settings"		=>	"Settings",
 	"srv_izvoz_SPSS_note"			=>	"Data can be exported to SPSS/PASW by following five short steps:",
 	"srv_izvoz_step1_SPSS"			=>	"Click on the button below and save the file (.txt format) into the selected folder:",