diff --git a/assets/css/settings-styles.css b/assets/css/settings-styles.css
index 6f44daa75..a883b8c46 100644
--- a/assets/css/settings-styles.css
+++ b/assets/css/settings-styles.css
@@ -463,6 +463,10 @@ body.woocommerce_page_wpo_wcpdf_options_page {
 	transform: translateY(-50%) rotate(180deg);
 }
 
+#wpo-wcpdf-preview-wrapper .my_account_buttons_custom {
+	margin-top: 1em;
+}
+
 
 /* WPML */
 
@@ -1345,3 +1349,10 @@ div.upgrade-table-description a,
 		justify-content: center;
 	}
 }
+
+/* Override WordPress default form style */
+@media screen and (max-width: 782px) {
+	input[type="radio"], input[type="checkbox"] {
+		margin-bottom: 0.5em;
+	}
+}
diff --git a/includes/Documents/Invoice.php b/includes/Documents/Invoice.php
index 30e7e5062..eb965d71a 100644
--- a/includes/Documents/Invoice.php
+++ b/includes/Documents/Invoice.php
@@ -639,20 +639,20 @@ public function get_settings_categories( string $output_format ): array {
 						'enabled',
 						'attach_to_email_ids',
 						'disable_for_statuses',
-						'number_format',
 						'my_account_buttons',
 					),
 				),
-				'document_display' => array(
+				'document_details' => array(
 					'title'   => __( 'Document details', 'woocommerce-pdf-invoices-packing-slips' ),
 					'members' => array(
 						'display_email',
 						'display_phone',
 						'display_customer_notes',
 						'display_shipping_address',
-						'display_date',
 						'display_number',
 						'next_invoice_number', // this should follow 'display_number'
+						'number_format',
+						'display_date',
 						'due_date'
 					)
 				),
diff --git a/includes/Documents/PackingSlip.php b/includes/Documents/PackingSlip.php
index e86838a65..0ad738fd7 100644
--- a/includes/Documents/PackingSlip.php
+++ b/includes/Documents/PackingSlip.php
@@ -232,13 +232,13 @@ public function get_settings_categories( string $output_format ): array {
 						'attach_to_email_ids',
 					),
 				),
-				'document_display' => array(
+				'document_details' => array(
 					'title'   => __( 'Document details', 'woocommerce-pdf-invoices-packing-slips' ),
 					'members' => array(
-						'display_billing_address',
 						'display_email',
 						'display_phone',
 						'display_customer_notes',
+						'display_billing_address',
 					),
 				),
 			),