Index: wp-admin/options-privacy.php
===================================================================
--- wp-admin/options-privacy.php	(revision 47259)
+++ wp-admin/options-privacy.php	(working copy)
@@ -115,24 +115,41 @@
 $title       = __( 'Privacy Settings' );
 $parent_file = 'options-general.php';
 
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'This screen contains the settings that help you to set up or affect your privacy policy.' ) . '</p>' .
+			'<p>' . __( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a Privacy Policy.' ) . '</p>',
+	)
+);
+
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'privacy-policy-page',
+		'title'   => __( 'Policy Page' ),
+		'content' => '<p>' . __( 'If you already have a Privacy Policy page, please select it. If not, please create one.' ) . '</p>' .
+			'<p>' . __( 'The new page will include help and suggestions for your Privacy Policy.' ) . '</p>' .
+			'<p>' . __( 'However, it is your responsibility to use those resources correctly, to provide the information that your Privacy Policy requires, and to keep that information current and accurate.' ) . '</p>' .
+			'<p>' . __( 'After your Privacy Policy page is set, we suggest that you edit it.' ) . '</p>' .
+			'<p>' . __( 'We would also suggest reviewing your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ) . '</p>',
+	)
+);
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	/* translators: 1: Privacy Policy guide URL */
+	'<p>' . sprintf( __( '<a href="%1$s">Privacy Policy guide</a>' ), esc_url( admin_url( 'privacy-policy-guide.php' ) ) ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-privacy-screen/">Documentation on Privacy Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+);
+
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
 ?>
 <div class="wrap">
 	<h1><?php echo $title; ?></h1>
-	<h2><?php _e( 'Privacy Policy Page' ); ?></h2>
-	<p>
-		<?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a Privacy Policy.' ); ?>
-		<?php _e( 'If you already have a Privacy Policy page, please select it below. If not, please create one.' ); ?>
-	</p>
-	<p>
-		<?php _e( 'The new page will include help and suggestions for your Privacy Policy.' ); ?>
-		<?php _e( 'However, it is your responsibility to use those resources correctly, to provide the information that your Privacy Policy requires, and to keep that information current and accurate.' ); ?>
-	</p>
-	<p>
-		<?php _e( 'After your Privacy Policy page is set, we suggest that you edit it.' ); ?>
-		<?php _e( 'We would also suggest reviewing your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
-	</p>
+	<h2><?php _e( 'Policy Page' ); ?></h2>
 	<?php
 
 	if ( $privacy_policy_page_exists ) {
@@ -146,12 +163,12 @@
 
 		$view_href = get_permalink( $privacy_policy_page_id );
 		?>
-		<p class="tools-privacy-edit"><strong>
+		<p class="tools-privacy-edit">
 			<?php
 			if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
 				printf(
 					/* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page. */
-					__( '<a href="%1$s">Edit</a> or <a href="%2$s">view</a> your Privacy Policy page content.' ),
+					__( 'You can already <a href="%1$s">edit</a> or <a href="%2$s">view</a> your Privacy Policy page content.' ),
 					esc_url( $edit_href ),
 					esc_url( $view_href )
 				);
@@ -158,41 +175,44 @@
 			} else {
 				printf(
 					/* translators: 1: URL to edit Privacy Policy page, 2: URL to preview Privacy Policy page. */
-					__( '<a href="%1$s">Edit</a> or <a href="%2$s">preview</a> your Privacy Policy page content.' ),
+					__( 'You can already <a href="%1$s">edit</a> or <a href="%2$s">preview</a> your Privacy Policy page content.' ),
 					esc_url( $edit_href ),
 					esc_url( $view_href )
 				);
 			}
 			?>
-		</strong></p>
+		</p>
 		<?php
 	}
 	?>
-	<p>
-		<?php
-		printf(
-			/* translators: 1: Privacy Policy guide URL, 2: Additional link attributes, 3: Accessibility text. */
-			__( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
-			esc_url( admin_url( 'privacy-policy-guide.php' ) ),
-			'',
-			''
-		);
-		?>
-	</p>
-
-	<hr>
 	<table class="form-table tools-privacy-policy-page" role="presentation">
 		<tr>
 			<th scope="row">
 				<label for="page_for_privacy_policy">
 					<?php
-					if ( $privacy_policy_page_exists ) {
-						_e( 'Change your Privacy Policy page' );
-					} else {
-						_e( 'Select a Privacy Policy page' );
-					}
+						_e( 'Your Privacy Policy page' );
 					?>
 				</label>
+				<br />
+<!--
+			<?php
+			if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
+				printf(
+					/* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page. */
+					__( '<span style="padding-right: 25px;"><a href="%1$s">Edit</a></span><a href="%2$s">View</a>' ),
+					esc_url( $edit_href ),
+					esc_url( $view_href )
+				);
+			} else {
+				printf(
+					/* translators: 1: URL to edit Privacy Policy page, 2: URL to preview Privacy Policy page. */
+					__( '<span style="padding-right: 25px;"><a href="%1$s">Edit</a></span><span style="padding-left:40px;"><a href="%2$s">Preview</a></span>' ),
+					esc_url( $edit_href ),
+					esc_url( $view_href )
+				);
+			}
+			?>
+-->
 			</th>
 			<td>
 				<?php
@@ -209,7 +229,7 @@
 
 				if ( $has_pages ) :
 					?>
-					<form method="post" action="">
+					<form method="post" action="" style="float:left;">
 						<input type="hidden" name="action" value="set-privacy-page" />
 						<?php
 						wp_dropdown_pages(
@@ -230,8 +250,8 @@
 				<?php endif; ?>
 
 				<form class="wp-create-privacy-page" method="post" action="">
-					<input type="hidden" name="action" value="create-privacy-page" />
-					<span>
+					<input type="hidden" name="action" value="create-privacy-page" /> 
+					<span style="padding-left: 40px;">
 						<?php
 						if ( $has_pages ) {
 							_e( 'Or:' );