diff --git a/datamodels/2.x/itop-portal-base/portal/public/js/export.js b/datamodels/2.x/itop-portal-base/portal/public/js/export.js
index 456402fbc..c67b6b6d1 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/js/export.js
+++ b/datamodels/2.x/itop-portal-base/portal/public/js/export.js
@@ -36,72 +36,71 @@ function ExportStartExport() {
 
 function ExportError(sMessage) {
 	sDataState = 'error';
-	$('#export-feedback').addClass('ibo-is-hidden');
-	$('#export-text-result').removeClass('ibo-is-hidden');
+	$('#export-feedback').hide();
+	$('#export-text-result').show();
 	$('#export-error').html(sMessage);
 }
 
 function ExportRun(data) {
-    switch (data.code) {
-        case 'run':
-            // Continue
-            $('.progress').progressbar({value: data.percentage});
-            $('.export-message').html(data.message);
-            oParams = {};
-            oParams.token = data.token;
-            if (sDataState == 'cancelled') {
-	            oParams.operation = 'export_cancel';
-	            $('#export-cancel').addClass('ibo-is-hidden');
-	            $('#export-close').removeClass('ibo-is-hidden');
-            }
-            else {
-                oParams.operation = 'export_build_portal';
-            }
+	switch (data.code) {
+		case 'run':
+			// Continue
+			$('.progress').progressbar({value: data.percentage});
+			$('.export-message').html(data.message);
+			oParams = {};
+			oParams.token = data.token;
+			if (sDataState == 'cancelled') {
+				oParams.operation = 'export_cancel';
+				$('#export-cancel').hide();
+				$('#export-close').show();
+			} else {
+				oParams.operation = 'export_build_portal';
+			}
 
-            $.post(GetAbsoluteUrlAppRoot() + 'pages/ajax.render.php', oParams, function (data) {
-                    ExportRun(data);
-                },
-                'json');
-            break;
+			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
+					ExportRun(data);
+				},
+				'json');
+			break;
 
-	    case 'done':
-		    sDataState = 'done';
-		    $('#export-cancel').addClass('ibo-is-hidden');
-		    $('#export-close').removeClass('ibo-is-hidden');
-		    $('.progress').progressbar({value: data.percentage});
-		    sMessage = '<a href="'+GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=export_download&token='+data.token+'" target="_blank">'+data.message+'</a>';
-		    $('.export-message').html(sMessage);
-		    if (data.text_result != undefined) {
-			    if (data.mime_type == 'text/html') {
-				    $('#export-content').parent().html(data.text_result);
-				    $('#export-text-result').show();
-			    } else {
-				    if ($('#export-text-result').closest('ui-dialog').length == 0) {
-                        // not inside a dialog box, adjust the height... approximately
-                        var jPane = $('#export-text-result').closest('.ui-layout-content');
-                        var iTotalHeight = jPane.height();
-                        jPane.children(':visible').each(function () {
-                            if ($(this).attr('id') != '') {
-                                iTotalHeight -= $(this).height();
-                            }
-                        });
-                        $('#export-content').height(iTotalHeight - 80);
-                    }
-				    $('#export-content').val(data.text_result);
-				    $('#export-text-result').removeClass('ibo-is-hidden');
-                }
-            }
-            break;
+		case 'done':
+			sDataState = 'done';
+			$('#export-cancel').hide();
+			$('#export-close').show();
+			$('.progress').progressbar({value: data.percentage});
+			sMessage = '<a href="'+GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=export_download&token='+data.token+'" target="_blank">'+data.message+'</a>';
+			$('.export-message').html(sMessage);
+			if (data.text_result != undefined) {
+				if (data.mime_type == 'text/html') {
+					$('#export-content').parent().html(data.text_result);
+					$('#export-text-result').show();
+				} else {
+					if ($('#export-text-result').closest('ui-dialog').length == 0) {
+						// not inside a dialog box, adjust the height... approximately
+						var jPane = $('#export-text-result').closest('.ui-layout-content');
+						var iTotalHeight = jPane.height();
+						jPane.children(':visible').each(function () {
+							if ($(this).attr('id') != '') {
+								iTotalHeight -= $(this).height();
+							}
+						});
+						$('#export-content').height(iTotalHeight-80);
+					}
+					$('#export-content').val(data.text_result);
+					$('#export-text-result').show();
+				}
+			}
+			break;
 
-	    case 'error':
-		    sDataState = 'error';
-		    $('#export-feedback').addClass('ibo-is-hidden');
-		    $('#export-text-result').removeClass('ibo-is-hidden');
-		    $('#export-error').html(data.message);
-		    $('#export-cancel').addClass('ibo-is-hidden');
-		    $('#export-close').removeClass('ibo-is-hidden');
-		    break;
+		case 'error':
+			sDataState = 'error';
+			$('#export-feedback').hide();
+			$('#export-text-result').show();
+			$('#export-error').html(data.message);
+			$('#export-cancel').hide();
+			$('#export-close').show();
+			break;
 
-        default:
-    }
+		default:
+	}
 }