diff --git a/php/class-export.php b/php/class-export.php
index fa6d3408..31644b0a 100644
--- a/php/class-export.php
+++ b/php/class-export.php
@@ -274,7 +274,7 @@ public function do_export() {
 		}
 
 		elseif ( 'php' === $this->format ) {
-			echo '<?php';
+			echo "<?php\n";
 		}
 
 		/* Process the snippet items */
diff --git a/php/class-list-table.php b/php/class-list-table.php
index ab68bcc8..2d45e862 100644
--- a/php/class-list-table.php
+++ b/php/class-list-table.php
@@ -407,9 +407,9 @@ public function get_bulk_actions() {
 		$actions = array(
 			'activate-selected'   => $this->is_network ? __( 'Network Activate', 'code-snippets' ) : __( 'Activate', 'code-snippets' ),
 			'deactivate-selected' => $this->is_network ? __( 'Network Deactivate', 'code-snippets' ) : __( 'Deactivate', 'code-snippets' ),
+			'download-selected'   => __( 'Download', 'code-snippets' ),
 			'export-selected'     => __( 'Export', 'code-snippets' ),
 			'delete-selected'     => __( 'Delete', 'code-snippets' ),
-			'download-selected'   => __( 'Download', 'code-snippets' ),
 		);
 		return apply_filters( 'code_snippets/list_table/bulk_actions', $actions );
 	}
diff --git a/php/views/edit.php b/php/views/edit.php
index f3123cfb..80efb880 100644
--- a/php/views/edit.php
+++ b/php/views/edit.php
@@ -111,16 +111,16 @@
 
 			if ( 0 !== $snippet->id ) {
 
-				/* Export button */
-
-				submit_button( __( 'Export', 'code-snippets' ), 'secondary', 'export_snippet', false );
-
 				/* Download button */
 
 				if ( apply_filters( 'code_snippets/enable_downloads', true ) ) {
 					submit_button( __( 'Download', 'code-snippets' ), 'secondary', 'download_snippet', false );
 				}
 
+				/* Export button */
+
+				submit_button( __( 'Export', 'code-snippets' ), 'secondary', 'export_snippet', false );
+
 				/* Delete button */
 
 				$confirm_delete_js = esc_js(