diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index fdb0516c8c..938af64009 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -4713,6 +4713,29 @@ $text['header-device']['ru-ru'] = "Устройство";
 $text['header-device']['sv-se'] = "Enhet";
 $text['header-device']['uk-ua'] = "";
 
+$text['description-device_export']['en-us'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['en-gb'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ar-eg'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['de-at'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['de-ch'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['de-de'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ek-gr'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['es-cl'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['es-mx'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['fr-ca'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['fr-fr'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['he-il'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['it-it'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['nl-nl'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['pl-pl'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['pt-br'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['pt-pt'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ro-ro'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ru-ru'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['sv-se'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['uk-ua'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['tr-tr'] = "Select the fields you wish to include in the export.";
+
 $text['description-user']['en-us'] = "Assign a user to this device.";
 $text['description-user']['en-gb'] = "Assign a user to this device.";
 $text['description-user']['ar-eg'] = "";
diff --git a/app/devices/device_download.php b/app/devices/device_download.php
index 95892c64e8..f3569ae1be 100644
--- a/app/devices/device_download.php
+++ b/app/devices/device_download.php
@@ -147,7 +147,6 @@
 				$database = new database;
 				$devices = $database->select($sql, $parameters, 'all');
 				unset($sql, $parameters, $column_names);
-				//print_r($extensions);
 
 				foreach($column_group as $table_name => $columns) {
 					if ($table_name !== 'devices') {
@@ -202,27 +201,36 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<table class='list'>\n";
-	echo "<tr class='list-header'>\n";
-	echo "	<th class='checkbox'>\n";
-	echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($available_columns ?: "style='visibility: hidden;'").">\n";
-	echo "	</th>\n";
-	echo "	<th>".$text['label-column_name']."</th>\n";
-	echo "</tr>\n";
+	echo $text['description-device_export'];
+	echo "<br /><br />\n";
 
 	if (is_array($available_columns) && @sizeof($available_columns) != 0) {
 		$x = 0;
 		foreach ($available_columns as $table_name => $columns) {
+			$table_name_label = ucwords(str_replace(['-','_',],' ', $table_name));
+			echo "<div class='category'>\n";
+			echo "<b>".$table_name_label."</b>\n";
+			echo "<br>\n";
+			echo "<table class='list'>\n";
+			echo "<tr class='list-header'>\n";
+			echo "	<th class='checkbox'>\n";
+			echo "		<input type='checkbox' id='checkbox_all_".$table_name."' name='checkbox_all' onclick=\"list_all_toggle('".$table_name."');\" ".($available_columns ?: "style='visibility: hidden;'").">\n";
+			echo "	</th>\n";
+			echo "	<th>".$text['label-column_name']."</th>\n";
+			echo "</tr>\n";
 			foreach ($columns as $column_name) {
 				$list_row_onclick = "if (!this.checked) { document.getElementById('checkbox_all').checked = false; }";
 				echo "<tr class='list-row' href='".$list_row_url."'>\n";
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='column_group[".$table_name."][".$column_name."]' id='checkbox_".$x."' value=\"".$column_name."\" onclick=\"".$list_row_onclick."\">\n";
+				echo "		<input type='checkbox' class='checkbox_".$table_name."' name='column_group[".$table_name."][".$column_name."]' id='checkbox_".$x."' value=\"".$column_name."\" onclick=\"".$list_row_onclick."\">\n";
 				echo "	</td>\n";
 				echo "	<td onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick."\">".$column_name."</td>";
 				echo "</tr>";
 				$x++;
 			}
+			echo "</table>\n";
+			echo "<br>\n";
+			echo "</div>\n";
 		}
 	}
 	
@@ -231,12 +239,10 @@
 	//echo "		<input type='hidden' name='column_group[device_lines][yyy]' value=\"yyy\">\n";
 	//echo "		<input type='hidden' name='column_group[device_zzz][zzz]' value=\"zzz\">\n";
 
-	echo "</table>\n";
-	echo "<br />\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
 
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file