From 97a669d75400afb6c2ff0c4f02e7b822a89c1f79 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@gmail.com>
Date: Mon, 17 Sep 2018 09:10:21 -0700
Subject: [PATCH] Update/Settings ui (#9952)

* Stats: Add new admin wrapper functions

* Update the Jetpack Debug page

* Add the Automattic airline tagline to the footer

* Fix mobile

So that it behavies the same as the header

* Only apply the wraper to the rest of the ui not the main dashboard

* Remove duplicate code use the dops styles in a consistant way

* Remove the reduent Jetpack from the header

* Remove the header and footer from the settings page

We are now using the wraper function so the admin header and footer are redundent.

* Updated the network settings.

* Add the new admin wrapper to share settings

* Update the links in the wrapper so that they only sshow up if the user has access to see them.

* Fix mobile styling.

* Better support for Jitm messages

* Minor fix`

Fixes a php warning found during testing

* Remove the error_log statment

* Add is-wide argument to the wrap_ui method

This enables the container to have a wider max width then the default container.

* Fix styling for hello dolly.

* Update the translation strings so that they don't have backslashes.

* Deprecate deleted files
---
 _inc/footer.php                               |  23 +--
 _inc/header.php                               |   4 +-
 .../admin-pages/class.jetpack-admin-page.php  | 144 ++++++++++++++++--
 .../admin-pages/class.jetpack-react-page.php  |   8 +-
 .../class.jetpack-settings-page.php           |  39 ++---
 class.jetpack-admin.php                       |  15 +-
 class.jetpack-debugger.php                    |   4 +-
 class.jetpack-network.php                     |  42 ++---
 class.jetpack.php                             |   1 -
 modules/publicize/ui.php                      |  14 +-
 modules/sharedaddy/sharing.php                |  13 +-
 modules/stats.php                             |  95 ++++--------
 views/admin/network-admin-alert.php           |  15 +-
 views/admin/network-admin-footer.php          |  36 +----
 views/admin/network-admin-header.php          |  18 +--
 views/admin/network-settings.php              |   4 +-
 16 files changed, 267 insertions(+), 208 deletions(-)

diff --git a/_inc/footer.php b/_inc/footer.php
index e20ced36f6d85..434b80f172dc6 100644
--- a/_inc/footer.php
+++ b/_inc/footer.php
@@ -1,17 +1,6 @@
-	</div><!-- .jp-lower -->
-		<div class="modal" aria-labelledby="modal-label">
-			<header>
-				<a href="#" class="close">&times;</a>
-				<ul>
-					<li class="learn-more"><a href="javascript:;" data-tab="learn-more"><?php esc_html_e( 'Learn More', 'jetpack' ); ?></a></li>
-					<li class="config"><a href="javascript:;" data-tab="config"><?php esc_html_e( 'Config', 'jetpack' ); ?></a></li>
-				</ul>
-			</header>
-			<div class="content-container"><div class="content"></div></div>
-		</div>
-		<div class="shade"></div>
-
-	</div><!-- .jp-frame -->
-</div><!-- .jp-content -->
-
-<?php if ( 'jetpack_modules' == $_GET['page'] ) return; ?>
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */
\ No newline at end of file
diff --git a/_inc/header.php b/_inc/header.php
index 01f577a80ac3b..8c2953d9709fa 100644
--- a/_inc/header.php
+++ b/_inc/header.php
@@ -1,4 +1,2 @@
 <?php $current = $_GET['page']; ?>
-<div class="jp-content">
-	<div class="jp-frame">
-		<div class="jp-lower">
+
diff --git a/_inc/lib/admin-pages/class.jetpack-admin-page.php b/_inc/lib/admin-pages/class.jetpack-admin-page.php
index ba2fefe8fa4f9..d352aa5663be6 100644
--- a/_inc/lib/admin-pages/class.jetpack-admin-page.php
+++ b/_inc/lib/admin-pages/class.jetpack-admin-page.php
@@ -92,7 +92,17 @@ function render() {
 			return;
 		}
 
-		$this->page_render();
+		// Check if we are looking at the main dashboard
+		if (
+			isset( $_GET['page'] ) &&
+			'jetpack' === $_GET['page'] &&
+		     empty( $_GET['configure'] )
+		)
+		{
+			$this->page_render();
+			return;
+		}
+		Jetpack_Admin_Page::wrap_ui( array( $this, 'page_render' ) );
 	}
 
 	function admin_help() {
@@ -104,14 +114,6 @@ function admin_page_load() {
 		$this->jetpack->admin_page_load();
 	}
 
-	function admin_page_top() {
-		include_once( JETPACK__PLUGIN_DIR . '_inc/header.php' );
-	}
-
-	function admin_page_bottom() {
-		include_once( JETPACK__PLUGIN_DIR . '_inc/footer.php' );
-	}
-
 	// Add page specific scripts and jetpack stats for all menu pages
 	function admin_scripts() {
 		$this->page_admin_scripts(); // Delegate to inheriting class
@@ -219,4 +221,128 @@ function check_plan_deactivate_modules( $page ) {
 			'deactivate' => $to_deactivate
 		);
 	}
+
+	static function load_wrapper_styles( ) {
+		$rtl = is_rtl() ? '.rtl' : '';
+		wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style{$rtl}.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
+		wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min{$rtl}.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
+		$custom_css = '
+			#wpcontent {
+				padding-left: 0 !important;
+			}
+			#wpbody-content {
+				background-color: #f3f6f8;
+			}
+			
+			#jp-plugin-container .wrap {
+				margin: 0 auto;
+				max-width:45rem;
+				padding: 0 1.5rem;
+			}
+			#jp-plugin-container.is-wide .wrap {
+				max-width: 1040px;
+			}
+			.wp-admin #dolly {
+			    float: none;
+			    position: relative;
+			    right: 0;
+			    left: 0;
+			    top: 0;
+			    padding: .625rem;
+			    text-align: right;
+			    background: #fff;
+			    font-size: .75rem;
+			    font-style: italic;
+			    color: #87a6bc;
+			    border-bottom: 1px #e9eff3 solid;
+			}
+		';
+		wp_add_inline_style( 'dops-css', $custom_css );
+	}
+
+	static function wrap_ui( $callback, $args = array() ) {
+		$defaults = array(
+			'is-wide' => false,
+		);
+		$args = wp_parse_args( $args, $defaults );
+		$jetpack_admin_url = admin_url( 'admin.php?page=jetpack' );
+
+		?>
+		<div id="jp-plugin-container" class="<?php if ( $args['is-wide'] ) { echo "is-wide"; } ?>">
+
+			<div class="jp-masthead">
+				<div class="jp-masthead__inside-container">
+					<div class="jp-masthead__logo-container">
+						<a class="jp-masthead__logo-link" href="<?php echo esc_url( $jetpack_admin_url ); ?>">
+							<svg class="jetpack-logo__masthead" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" height="32" viewBox="0 0 118 32"><path fill="#00BE28" d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z"></path><path d="M41.3,26.6c-0.5-0.7-0.9-1.4-1.3-2.1c2.3-1.4,3-2.5,3-4.6V8h-3V6h6v13.4C46,22.8,45,24.8,41.3,26.6z"></path><path d="M65,18.4c0,1.1,0.8,1.3,1.4,1.3c0.5,0,2-0.2,2.6-0.4v2.1c-0.9,0.3-2.5,0.5-3.7,0.5c-1.5,0-3.2-0.5-3.2-3.1V12H60v-2h2.1V7.1 H65V10h4v2h-4V18.4z"></path><path d="M71,10h3v1.3c1.1-0.8,1.9-1.3,3.3-1.3c2.5,0,4.5,1.8,4.5,5.6s-2.2,6.3-5.8,6.3c-0.9,0-1.3-0.1-2-0.3V28h-3V10z M76.5,12.3 c-0.8,0-1.6,0.4-2.5,1.2v5.9c0.6,0.1,0.9,0.2,1.8,0.2c2,0,3.2-1.3,3.2-3.9C79,13.4,78.1,12.3,76.5,12.3z"></path><path d="M93,22h-3v-1.5c-0.9,0.7-1.9,1.5-3.5,1.5c-1.5,0-3.1-1.1-3.1-3.2c0-2.9,2.5-3.4,4.2-3.7l2.4-0.3v-0.3c0-1.5-0.5-2.3-2-2.3 c-0.7,0-2.3,0.5-3.7,1.1L84,11c1.2-0.4,3-1,4.4-1c2.7,0,4.6,1.4,4.6,4.7L93,22z M90,16.4l-2.2,0.4c-0.7,0.1-1.4,0.5-1.4,1.6 c0,0.9,0.5,1.4,1.3,1.4s1.5-0.5,2.3-1V16.4z"></path><path d="M104.5,21.3c-1.1,0.4-2.2,0.6-3.5,0.6c-4.2,0-5.9-2.4-5.9-5.9c0-3.7,2.3-6,6.1-6c1.4,0,2.3,0.2,3.2,0.5V13 c-0.8-0.3-2-0.6-3.2-0.6c-1.7,0-3.2,0.9-3.2,3.6c0,2.9,1.5,3.8,3.3,3.8c0.9,0,1.9-0.2,3.2-0.7V21.3z"></path><path d="M110,15.2c0.2-0.3,0.2-0.8,3.8-5.2h3.7l-4.6,5.7l5,6.3h-3.7l-4.2-5.8V22h-3V6h3V15.2z"></path><path d="M58.5,21.3c-1.5,0.5-2.7,0.6-4.2,0.6c-3.6,0-5.8-1.8-5.8-6c0-3.1,1.9-5.9,5.5-5.9s4.9,2.5,4.9,4.9c0,0.8,0,1.5-0.1,2h-7.3 c0.1,2.5,1.5,2.8,3.6,2.8c1.1,0,2.2-0.3,3.4-0.7C58.5,19,58.5,21.3,58.5,21.3z M56,15c0-1.4-0.5-2.9-2-2.9c-1.4,0-2.3,1.3-2.4,2.9 C51.6,15,56,15,56,15z"></path></svg>
+						</a>
+					</div>
+					<div class="jp-masthead__nav">
+						<?php if ( is_network_admin() ) {
+							$current_screen = get_current_screen();
+
+							$highlight_current_sites = ( 'toplevel_page_jetpack-network' === $current_screen->id  ? 'is-primary' : '' );
+							$highlight_current_settings = ( 'jetpack_page_jetpack-settings-network' === $current_screen->id  ? 'is-primary' : '' );
+							?>
+							<span class="dops-button-group">
+								<?php
+								if ( current_user_can( 'jetpack_network_sites_page' ) ) {
+									?><a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack' ) ); ?>" type="button" class="<?php echo esc_attr( $highlight_current_sites ); ?> dops-button is-compact" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>"><?php echo esc_html_x( 'Sites', 'Navigation item', 'jetpack' ); ?></a><?php
+								} if ( current_user_can( 'jetpack_network_settings_page' ) ) {
+									?><a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack-settings' ) ); ?>" type="button" class="<?php echo esc_attr( $highlight_current_settings ); ?> dops-button is-compact" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>"><?php echo esc_html_x( 'Network Settings', 'Navigation item', 'jetpack' ); ?></a><?php
+								} ?>
+							</span>
+						<?php } else { ?>
+							<span class="dops-button-group">
+								<a href="<?php echo esc_url( $jetpack_admin_url ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Dashboard', 'jetpack' ); ?></a><?php
+								if ( current_user_can( 'jetpack_manage_modules' ) ) {
+									?><a href="<?php echo esc_url( $jetpack_admin_url . '#/settings' ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Settings', 'jetpack' ); ?></a><?php
+								} ?>
+							</span>
+						<?php } ?>
+					</div>
+				</div>
+			</div>
+			<div class="wrap"><div id="jp-admin-notices" aria-live="polite"></div></div>
+			<!-- START OF CALLBACK -->
+			<?php
+			ob_start();
+			call_user_func( $callback );
+			$callback_ui = ob_get_contents();
+			ob_end_clean();
+			echo $callback_ui;
+			?>
+			<!-- END OF CALLBACK -->
+			<div class="jp-footer">
+				<div class="jp-footer__a8c-attr-container"><a href="https://automattic.com" target="_blank" rel="noopener noreferrer"><svg role="img" class="jp-footer__a8c-attr" x="0" y="0" viewBox="0 0 935 38.2" enable-background="new 0 0 935 38.2" aria-labelledby="a8c-svg-title"><title id="a8c-svg-title">An Automattic Airline</title><path d="M317.1 38.2c-12.6 0-20.7-9.1-20.7-18.5v-1.2c0-9.6 8.2-18.5 20.7-18.5 12.6 0 20.8 8.9 20.8 18.5v1.2C337.9 29.1 329.7 38.2 317.1 38.2zM331.2 18.6c0-6.9-5-13-14.1-13s-14 6.1-14 13v0.9c0 6.9 5 13.1 14 13.1s14.1-6.2 14.1-13.1V18.6zM175 36.8l-4.7-8.8h-20.9l-4.5 8.8h-7L157 1.3h5.5L182 36.8H175zM159.7 8.2L152 23.1h15.7L159.7 8.2zM212.4 38.2c-12.7 0-18.7-6.9-18.7-16.2V1.3h6.6v20.9c0 6.6 4.3 10.5 12.5 10.5 8.4 0 11.9-3.9 11.9-10.5V1.3h6.7V22C231.4 30.8 225.8 38.2 212.4 38.2zM268.6 6.8v30h-6.7v-30h-15.5V1.3h37.7v5.5H268.6zM397.3 36.8V8.7l-1.8 3.1 -14.9 25h-3.3l-14.7-25 -1.8-3.1v28.1h-6.5V1.3h9.2l14 24.4 1.7 3 1.7-3 13.9-24.4h9.1v35.5H397.3zM454.4 36.8l-4.7-8.8h-20.9l-4.5 8.8h-7l19.2-35.5h5.5l19.5 35.5H454.4zM439.1 8.2l-7.7 14.9h15.7L439.1 8.2zM488.4 6.8v30h-6.7v-30h-15.5V1.3h37.7v5.5H488.4zM537.3 6.8v30h-6.7v-30h-15.5V1.3h37.7v5.5H537.3zM569.3 36.8V4.6c2.7 0 3.7-1.4 3.7-3.4h2.8v35.5L569.3 36.8 569.3 36.8zM628 11.3c-3.2-2.9-7.9-5.7-14.2-5.7 -9.5 0-14.8 6.5-14.8 13.3v0.7c0 6.7 5.4 13 15.3 13 5.9 0 10.8-2.8 13.9-5.7l4 4.2c-3.9 3.8-10.5 7.1-18.3 7.1 -13.4 0-21.6-8.7-21.6-18.3v-1.2c0-9.6 8.9-18.7 21.9-18.7 7.5 0 14.3 3.1 18 7.1L628 11.3zM321.5 12.4c1.2 0.8 1.5 2.4 0.8 3.6l-6.1 9.4c-0.8 1.2-2.4 1.6-3.6 0.8l0 0c-1.2-0.8-1.5-2.4-0.8-3.6l6.1-9.4C318.7 11.9 320.3 11.6 321.5 12.4L321.5 12.4z"></path><path d="M37.5 36.7l-4.7-8.9H11.7l-4.6 8.9H0L19.4 0.8H25l19.7 35.9H37.5zM22 7.8l-7.8 15.1h15.9L22 7.8zM82.8 36.7l-23.3-24 -2.3-2.5v26.6h-6.7v-36H57l22.6 24 2.3 2.6V0.8h6.7v35.9H82.8z"></path><path d="M719.9 37l-4.8-8.9H694l-4.6 8.9h-7.1l19.5-36h5.6l19.8 36H719.9zM704.4 8l-7.8 15.1h15.9L704.4 8zM733 37V1h6.8v36H733zM781 37c-1.8 0-2.6-2.5-2.9-5.8l-0.2-3.7c-0.2-3.6-1.7-5.1-8.4-5.1h-12.8V37H750V1h19.6c10.8 0 15.7 4.3 15.7 9.9 0 3.9-2 7.7-9 9 7 0.5 8.5 3.7 8.6 7.9l0.1 3c0.1 2.5 0.5 4.3 2.2 6.1V37H781zM778.5 11.8c0-2.6-2.1-5.1-7.9-5.1h-13.8v10.8h14.4c5 0 7.3-2.4 7.3-5.2V11.8zM794.8 37V1h6.8v30.4h28.2V37H794.8zM836.7 37V1h6.8v36H836.7zM886.2 37l-23.4-24.1 -2.3-2.5V37h-6.8V1h6.5l22.7 24.1 2.3 2.6V1h6.8v36H886.2zM902.3 37V1H935v5.6h-26v9.2h20v5.5h-20v10.1h26V37H902.3z"></path></svg></a></div>
+				<ul class="jp-footer__links">
+					<li class="jp-footer__link-item">
+						<a href="https://jetpack.com" target="_blank" rel="noopener noreferrer" class="jp-footer__link" title="<?php esc_html_e( 'Jetpack version', 'jetpack' ); ?>">Jetpack <?php echo JETPACK__VERSION; ?></a>
+					</li>
+					<li class="jp-footer__link-item">
+						<a href="https://wordpress.com/tos/" target="_blank" rel="noopener noreferrer" title="<?php esc_html__( 'WordPress.com Terms of Service', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Terms', 'Navigation item', 'jetpack' ); ?></a>
+					</li>
+					<li class="jp-footer__link-item">
+						<a href="<?php echo esc_url( $jetpack_admin_url . '#/privacy' ); ?>" rel="noopener noreferrer" title="<?php esc_html_e( "Automattic's Privacy Policy", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Privacy', 'Navigation item', 'jetpack' ); ?></a>
+					</li>
+					<?php if ( is_multisite() && current_user_can( 'jetpack_network_sites_page' ) ) { ?>
+						<li class="jp-footer__link-item">
+							<a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack' ) ); ?>" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Network Sites', 'Navigation item', 'jetpack' ); ?></a>
+						</li>
+					<?php } ?>
+					<?php if ( is_multisite() && current_user_can( 'jetpack_network_settings_page' ) ) { ?>
+						<li class="jp-footer__link-item">
+							<a href="<?php echo esc_url( network_admin_url( 'admin.php?page=jetpack-settings' ) ); ?>" title="<?php esc_html_e( "Manage your network's Jetpack Sites.", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Network Settings', 'Navigation item', 'jetpack' ); ?></a>
+						</li>
+					<?php } ?>
+					<?php if ( current_user_can( 'manage_options' ) ) { ?>
+						<li class="jp-footer__link-item">
+							<a href="<?php echo esc_url( admin_url() . 'admin.php?page=jetpack-debugger' ); ?>" title="<?php esc_html_e( "Test your site's compatibility with Jetpack.", 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Debug', 'Navigation item', 'jetpack' ); ?></a>
+						</li>
+					<?php } ?>
+				</ul>
+			</div>
+		</div>
+<?php return;
+	}
 }
diff --git a/_inc/lib/admin-pages/class.jetpack-react-page.php b/_inc/lib/admin-pages/class.jetpack-react-page.php
index 8433cf002f1d5..b03858a2da4f5 100644
--- a/_inc/lib/admin-pages/class.jetpack-react-page.php
+++ b/_inc/lib/admin-pages/class.jetpack-react-page.php
@@ -109,7 +109,6 @@ function jetpack_menu_order( $menu_order ) {
 	function render_nojs_configurable( $module_name ) {
 		$module_name = preg_replace( '/[^\da-z\-]+/', '', $_GET['configure'] );
 
-		include_once( JETPACK__PLUGIN_DIR . '_inc/header.php' );
 		echo '<div class="wrap configure-module">';
 
 		if ( Jetpack::is_module( $module_name ) && current_user_can( 'jetpack_configure_modules' ) ) {
@@ -167,14 +166,11 @@ function get_dismissed_jetpack_notices() {
 	}
 
 	function additional_styles() {
-		$rtl = is_rtl() ? '.rtl' : '';
-
-		wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
-		wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
+		Jetpack_Admin_Page::load_wrapper_styles();
 	}
 
 	function page_admin_scripts() {
-		if ( $this->is_redirecting ) {
+		if ( $this->is_redirecting || isset( $_GET['configure'] ) ) {
 			return; // No need for scripts on a fallback page
 		}
 
diff --git a/_inc/lib/admin-pages/class.jetpack-settings-page.php b/_inc/lib/admin-pages/class.jetpack-settings-page.php
index 3934a27d0b54e..13854cc718b37 100644
--- a/_inc/lib/admin-pages/class.jetpack-settings-page.php
+++ b/_inc/lib/admin-pages/class.jetpack-settings-page.php
@@ -12,7 +12,14 @@ function add_page_actions( $hook ) {}
 
 	// Adds the Settings sub menu
 	function get_page_hook() {
-		return add_submenu_page( null, __( 'Jetpack Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_manage_modules', 'jetpack_modules', array( $this, 'render' ) );
+		return add_submenu_page(
+			null,
+			__( 'Jetpack Settings', 'jetpack' ),
+			__( 'Settings', 'jetpack' ),
+			'jetpack_manage_modules',
+			'jetpack_modules',
+			array( $this, 'render' )
+		);
 	}
 
 	// Renders the module list table where you can use bulk action or row
@@ -20,17 +27,6 @@ function get_page_hook() {
 	function page_render() {
 		$list_table = new Jetpack_Modules_List_Table;
 
-		$static_html = @file_get_contents( JETPACK__PLUGIN_DIR . '_inc/build/static.html' );
-
-		// If static.html isn't there, there's nothing else we can do.
-		if ( false === $static_html ) {
-			echo '<p>';
-			esc_html_e( 'Error fetching static.html. Try running: ', 'jetpack' );
-			echo '<code>yarn distclean && yarn build</code>';
-			echo '</p>';
-			return;
-		}
-
 		// We have static.html so let's continue trying to fetch the others
 		$noscript_notice = @file_get_contents( JETPACK__PLUGIN_DIR . '_inc/build/static-noscript-notice.html' );
 		$version_notice = $rest_api_notice = @file_get_contents( JETPACK__PLUGIN_DIR . '_inc/build/static-version-notice.html' );
@@ -80,10 +76,6 @@ function page_render() {
 			$ie_notice
 		);
 
-		ob_start();
-
-		$this->admin_page_top();
-
 		if ( $this->is_wp_version_too_old() ) {
 			echo $version_notice;
 		}
@@ -152,17 +144,6 @@ function page_render() {
 		</div><!-- /.content -->
 		<?php
 
-		$this->admin_page_bottom();
-
-		$page_content = ob_get_contents();
-		ob_end_clean();
-
-		echo str_replace(
-			'<div class="jp-loading-placeholder"><span class="dashicons dashicons-wordpress-alt"></span></div>',
-			$page_content,
-			$static_html
-		);
-
 		JetpackTracking::record_user_event( 'wpa_page_view', array( 'path' => 'old_settings' ) );
 	}
 
@@ -172,9 +153,7 @@ function page_render() {
 	 * @since 4.3.0
 	 */
 	function additional_styles() {
-		$rtl = is_rtl() ? '.rtl' : '';
-		wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
-		wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
+		Jetpack_Admin_Page::load_wrapper_styles();
 	}
 
 	// Javascript logic specific to the list table
diff --git a/class.jetpack-admin.php b/class.jetpack-admin.php
index 14020c4a283ea..cce0b2ba77f07 100644
--- a/class.jetpack-admin.php
+++ b/class.jetpack-admin.php
@@ -252,15 +252,26 @@ function fix_redirect( $module, $redirect = true ) {
 
 	function admin_menu_debugger() {
 		Jetpack_Debugger::disconnect_and_redirect();
-		$debugger_hook = add_submenu_page( null, __( 'Jetpack Debugging Center', 'jetpack' ), '', 'manage_options', 'jetpack-debugger', array( $this, 'debugger_page' ) );
+		$debugger_hook = add_submenu_page(
+			null,
+			__( 'Debugging Center', 'jetpack' ),
+			'',
+			'manage_options',
+			'jetpack-debugger',
+			array( $this, 'wrap_debugger_page' )
+		);
 		add_action( "admin_head-$debugger_hook", array( 'Jetpack_Debugger', 'jetpack_debug_admin_head' ) );
 	}
 
-	function debugger_page() {
+	function wrap_debugger_page( ) {
 		nocache_headers();
 		if ( ! current_user_can( 'manage_options' ) ) {
 			die( '-1' );
 		}
+		Jetpack_Admin_Page::wrap_ui( array( $this, 'debugger_page' ) );
+	}
+
+	function debugger_page() {
 		Jetpack_Debugger::jetpack_debug_display_handler();
 	}
 }
diff --git a/class.jetpack-debugger.php b/class.jetpack-debugger.php
index 493aecd72d5ab..3fb2ac7b5f7dd 100644
--- a/class.jetpack-debugger.php
+++ b/class.jetpack-debugger.php
@@ -217,7 +217,7 @@ public static function jetpack_debug_display_handler() {
 
 		?>
 		<div class="wrap">
-			<h2><?php esc_html_e( 'Jetpack Debugging Center', 'jetpack' ); ?></h2>
+			<h2><?php esc_html_e( 'Debugging Center', 'jetpack' ); ?></h2>
 			<?php if ( isset( $can_disconnect ) && $can_disconnect ) : ?>
 				<div id="message" class="updated notice notice-success is-dismissible"><p><?php esc_html_e( 'This site was successfully disconnected.', 'jetpack' ) ?> <a href="<?php echo esc_url( Jetpack::admin_url() ); ?>"><?php esc_html_e( 'Go to connection screen.', 'jetpack' ); ?></a></p>
 					<button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php esc_html_e( 'Dismiss this notice.', 'jetpack' ); ?></span></button></div>
@@ -445,6 +445,8 @@ public static function jetpack_debug_display_handler() {
 	}
 
 	public static function jetpack_debug_admin_head() {
+
+		Jetpack_Admin_Page::load_wrapper_styles();
 		?>
 		<style type="text/css">
 
diff --git a/class.jetpack-network.php b/class.jetpack-network.php
index 1ea936991deae..8de4a43ed17fd 100644
--- a/class.jetpack-network.php
+++ b/class.jetpack-network.php
@@ -267,10 +267,11 @@ public function get_url( $args ) {
 	 * @since 2.9
 	 */
 	public function add_network_admin_menu() {
-		add_menu_page( __( 'Jetpack', 'jetpack' ), __( 'Jetpack', 'jetpack' ), 'jetpack_network_admin_page', 'jetpack', array( $this, 'network_admin_page' ), 'div', 3 );
-		add_submenu_page( 'jetpack', __( 'Jetpack Sites', 'jetpack' ), __( 'Sites', 'jetpack' ), 'jetpack_network_sites_page', 'jetpack', array( $this, 'network_admin_page' ) );
-		add_submenu_page( 'jetpack', __( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_network_settings_page', 'jetpack-settings', array( $this, 'render_network_admin_settings_page' ) );
-
+		add_menu_page( __( 'Jetpack', 'jetpack' ), __( 'Jetpack', 'jetpack' ), 'jetpack_network_admin_page', 'jetpack', array( $this, 'wrap_network_admin_page' ), 'div', 3 );
+		$jetpack_sites_page_hook = add_submenu_page( 'jetpack', __( 'Jetpack Sites', 'jetpack' ), __( 'Sites', 'jetpack' ), 'jetpack_network_sites_page', 'jetpack', array( $this, 'wrap_network_admin_page' ) );
+		$jetpack_settings_page_hook = add_submenu_page( 'jetpack', __( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_network_settings_page', 'jetpack-settings', array( $this, 'wrap_render_network_admin_settings_page' ) );
+		add_action( "admin_print_styles-$jetpack_sites_page_hook",  array( 'Jetpack_Admin_Page', 'load_wrapper_styles' ) );
+		add_action( "admin_print_styles-$jetpack_settings_page_hook",  array( 'Jetpack_Admin_Page', 'load_wrapper_styles' ) );
 		/**
 		 * As jetpack_register_genericons is by default fired off a hook,
 		 * the hook may have already fired by this point.
@@ -357,11 +358,16 @@ public function jetpack_sites_list() {
 	public function show_jetpack_notice() {
 		if ( isset( $_GET['action'] ) && 'connected' == $_GET['action'] ) {
 			$notice = __( 'Site successfully connected.', 'jetpack' );
+			$classname = 'updated';
 		} else if ( isset( $_GET['action'] ) && 'connection_failed' == $_GET['action'] ) {
-			$notice = __( 'Site connection <strong>failed</strong>', 'jetpack' );
-		}
-
-		Jetpack::init()->load_view( 'admin/network-admin-alert.php', array( 'notice' => $notice ) );
+			$notice = __( 'Site connection failed!', 'jetpack' );
+			$classname = 'error';
+		}
+		?>
+		<div id="message" class="<?php echo esc_attr( $classname );?> jetpack-message jp-connect" style="display:block !important;">
+			<p><?php echo esc_html( $notice ); ?></p>
+		</div>
+		<?php
 	}
 
 	/**
@@ -479,7 +485,7 @@ public function do_subsiteregister( $site_id = null ) {
 		);
 
 		Jetpack::apply_activation_source_to_args( $args['body'] );
-		
+
 		// Attempt to retrieve shadow blog details
 		$response = Jetpack_Client::_wp_remote_request(
 			Jetpack::fix_url_for_bad_hosts( Jetpack::api_url( 'subsiteregister' ) ), $args, true
@@ -542,6 +548,10 @@ public function do_subsiteregister( $site_id = null ) {
 		restore_current_blog();
 	}
 
+	function wrap_network_admin_page() {
+		Jetpack_Admin_Page::wrap_ui( array( $this, 'network_admin_page' ) );
+	}
+
 	/**
 	 * Handles the displaying of all sites on the network that are
 	 * dis/connected to Jetpack
@@ -589,7 +599,6 @@ function network_admin_page() {
 		$myListTable->display();
 		echo '</form></div>';
 
-		$this->network_admin_page_footer();
 	}
 
 	/**
@@ -608,14 +617,6 @@ function network_admin_page_header() {
 		Jetpack::init()->load_view( 'admin/network-admin-header.php', $data );
 	}
 
-	/**
-	 * Stylized JP footer formatting
-	 *
-	 * @since 2.9
-	 */
-	function network_admin_page_footer() {
-		Jetpack::init()->load_view( 'admin/network-admin-footer.php' );
-	}
 
 	/**
 	 * Fires when the Jetpack > Settings page is saved.
@@ -694,6 +695,10 @@ public function save_network_settings_page() {
 		exit();
 	}
 
+	public function wrap_render_network_admin_settings_page() {
+		Jetpack_Admin_Page::wrap_ui( array( $this, 'render_network_admin_settings_page' ) );
+	}
+
 	public function render_network_admin_settings_page() {
 		$this->network_admin_page_header();
 		$options = wp_parse_args( get_site_option( $this->settings_name ), $this->setting_defaults );
@@ -719,7 +724,6 @@ public function render_network_admin_settings_page() {
 		);
 
 		Jetpack::init()->load_view( 'admin/network-settings.php', $data );
-		$this->network_admin_page_footer();
 	}
 
 	/**
diff --git a/class.jetpack.php b/class.jetpack.php
index 02faf912970a1..90b464598a388 100644
--- a/class.jetpack.php
+++ b/class.jetpack.php
@@ -4814,7 +4814,6 @@ public static function admin_screen_configure_module( $module_id ) {
 			<h3>
 			<?php
 				$module = Jetpack::get_module( $module_id );
-				echo '<a href="' . Jetpack::admin_url( 'page=jetpack_modules' ) . '">' . __( 'Jetpack by WordPress.com', 'jetpack' ) . '</a> &rarr; ';
 				printf( __( 'Configure %s', 'jetpack' ), $module['name'] );
 			?>
 			</h3>
diff --git a/modules/publicize/ui.php b/modules/publicize/ui.php
index 1db34e62064fe..7787732d208ef 100644
--- a/modules/publicize/ui.php
+++ b/modules/publicize/ui.php
@@ -51,10 +51,19 @@ function init() {
 	* If the ShareDaddy plugin is not active we need to add the sharing settings page to the menu still
 	*/
 	function sharing_menu() {
-		add_submenu_page( 'options-general.php', __( 'Sharing Settings', 'jetpack' ), __( 'Sharing', 'jetpack' ), 'publish_posts', 'sharing', array( &$this, 'management_page' ) );
+		add_submenu_page(
+			'options-general.php',
+			__( 'Sharing Settings', 'jetpack' ),
+			__( 'Sharing', 'jetpack' ),
+			'publish_posts',
+			'sharing',
+			array( &$this, 'wrapper_admin_page' )
+		);
 	}
 
-
+	function wrapper_admin_page() {
+		Jetpack_Admin_Page::wrap_ui( array( &$this, 'management_page' ), array( 'is-wide' => true ) );
+	}
 	/**
 	* Management page to load if Sharedaddy is not active so the 'pre_admin_screen_sharing' action exists.
 	*/
@@ -91,6 +100,7 @@ function load_assets() {
 			wp_enqueue_style( 'publicize', plugins_url( 'assets/publicize.css', __FILE__ ), array(), '20180301' );
 		}
 
+		Jetpack_Admin_Page::load_wrapper_styles();
 		wp_enqueue_style( 'social-logos' );
 
 		add_thickbox();
diff --git a/modules/sharedaddy/sharing.php b/modules/sharedaddy/sharing.php
index 19b0e3beec297..0e3d7ee556998 100644
--- a/modules/sharedaddy/sharing.php
+++ b/modules/sharedaddy/sharing.php
@@ -85,7 +85,14 @@ public function subscription_menu( $user ) {
 			}
 		}
 
-		add_submenu_page( 'options-general.php', __( 'Sharing Settings', 'jetpack' ), __( 'Sharing', 'jetpack' ), 'publish_posts', 'sharing', array( &$this, 'management_page' ) );
+		add_submenu_page(
+			'options-general.php',
+			__( 'Sharing Settings', 'jetpack' ),
+			__( 'Sharing', 'jetpack' ),
+			'publish_posts',
+			'sharing',
+			array( &$this, 'wrapper_admin_page' )
+		);
 	}
 
 	public function ajax_save_services() {
@@ -173,6 +180,10 @@ public function output_service( $id, $service, $show_dropdown = false ) {
 <?php
 	}
 
+	public function wrapper_admin_page() {
+		Jetpack_Admin_Page::wrap_ui( array( &$this, 'management_page' ), array( 'is-wide' =>true ) );
+	}
+
 	public function management_page() {
 		$sharer	 = new Sharing_Service();
 		$enabled = $sharer->get_blog_services();
diff --git a/modules/stats.php b/modules/stats.php
index 048048295186e..bcd9deea7d550 100644
--- a/modules/stats.php
+++ b/modules/stats.php
@@ -436,7 +436,7 @@ function stats_admin_menu() {
 		}
 	}
 
-	$hook = add_submenu_page( 'jetpack', __( 'Site Stats', 'jetpack' ), __( 'Site Stats', 'jetpack' ), 'view_stats', 'stats', 'stats_reports_page' );
+	$hook = add_submenu_page( 'jetpack', __( 'Site Stats', 'jetpack' ), __( 'Site Stats', 'jetpack' ), 'view_stats', 'stats', 'jetpack_admin_ui_stats_report_page_wrapper' );
 	add_action( "load-$hook", 'stats_reports_load' );
 }
 
@@ -461,10 +461,7 @@ function stats_reports_load() {
 	wp_enqueue_script( 'postbox' );
 	wp_enqueue_script( 'underscore' );
 
-	$rtl = is_rtl() ? '.rtl' : '';
-	wp_enqueue_style( 'dops-css', plugins_url( "_inc/build/admin.dops-style$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
-	wp_enqueue_style( 'components-css', plugins_url( "_inc/build/style.min$rtl.css", JETPACK__PLUGIN_FILE ), array(), JETPACK__VERSION );
-
+	Jetpack_Admin_Page::load_wrapper_styles();
 	add_action( 'admin_print_styles', 'stats_reports_css' );
 
 	if ( isset( $_GET['nojs'] ) && $_GET['nojs'] ) {
@@ -491,14 +488,6 @@ function stats_reports_load() {
 function stats_reports_css() {
 ?>
 <style type="text/css">
-#wpcontent {
-	padding-left: 0 !important;
-}
-
-.jetpack_page_stats {
-	background-color: #f3f6f8;
-}
-
 #jp-stats-wrap {
 	max-width: 1040px;
 	margin: 0 auto;
@@ -556,6 +545,15 @@ function stats_js_load_page_via_ajax() {
 <?php
 }
 
+function jetpack_admin_ui_stats_report_page_wrapper()  {
+	if( ! isset( $_GET['noheader'] ) && empty( $_GET['nojs'] ) && empty( $_COOKIE['stnojs'] ) ) {
+		Jetpack_Admin_Page::wrap_ui( 'stats_reports_page', array( 'is-wide' => true ) );
+	} else {
+		stats_reports_page();
+	}
+
+}
+
 /**
  * Stats Report Page.
  *
@@ -578,57 +576,30 @@ function stats_reports_page( $main_chart_only = false ) {
 		$http = is_ssl() ? 'https' : 'http';
 		// Loading message. No JS fallback message.
 ?>
-<div id="jp-plugin-container">
-	<div class="jp-masthead">
-		<div class="jp-masthead__inside-container">
-			<div class="jp-masthead__logo-container">
-				<a class="jp-masthead__logo-link" href="<?php echo esc_url( $jetpack_admin_url ); ?>">
-					<svg class="jetpack-logo__masthead" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" height="32" viewBox="0 0 118 32"><path fill="#00BE28" d="M16,0C7.2,0,0,7.2,0,16s7.2,16,16,16s16-7.2,16-16S24.8,0,16,0z M15,19H7l8-16V19z M17,29V13h8L17,29z"></path><path d="M41.3,26.6c-0.5-0.7-0.9-1.4-1.3-2.1c2.3-1.4,3-2.5,3-4.6V8h-3V6h6v13.4C46,22.8,45,24.8,41.3,26.6z"></path><path d="M65,18.4c0,1.1,0.8,1.3,1.4,1.3c0.5,0,2-0.2,2.6-0.4v2.1c-0.9,0.3-2.5,0.5-3.7,0.5c-1.5,0-3.2-0.5-3.2-3.1V12H60v-2h2.1V7.1 H65V10h4v2h-4V18.4z"></path><path d="M71,10h3v1.3c1.1-0.8,1.9-1.3,3.3-1.3c2.5,0,4.5,1.8,4.5,5.6s-2.2,6.3-5.8,6.3c-0.9,0-1.3-0.1-2-0.3V28h-3V10z M76.5,12.3 c-0.8,0-1.6,0.4-2.5,1.2v5.9c0.6,0.1,0.9,0.2,1.8,0.2c2,0,3.2-1.3,3.2-3.9C79,13.4,78.1,12.3,76.5,12.3z"></path><path d="M93,22h-3v-1.5c-0.9,0.7-1.9,1.5-3.5,1.5c-1.5,0-3.1-1.1-3.1-3.2c0-2.9,2.5-3.4,4.2-3.7l2.4-0.3v-0.3c0-1.5-0.5-2.3-2-2.3 c-0.7,0-2.3,0.5-3.7,1.1L84,11c1.2-0.4,3-1,4.4-1c2.7,0,4.6,1.4,4.6,4.7L93,22z M90,16.4l-2.2,0.4c-0.7,0.1-1.4,0.5-1.4,1.6 c0,0.9,0.5,1.4,1.3,1.4s1.5-0.5,2.3-1V16.4z"></path><path d="M104.5,21.3c-1.1,0.4-2.2,0.6-3.5,0.6c-4.2,0-5.9-2.4-5.9-5.9c0-3.7,2.3-6,6.1-6c1.4,0,2.3,0.2,3.2,0.5V13 c-0.8-0.3-2-0.6-3.2-0.6c-1.7,0-3.2,0.9-3.2,3.6c0,2.9,1.5,3.8,3.3,3.8c0.9,0,1.9-0.2,3.2-0.7V21.3z"></path><path d="M110,15.2c0.2-0.3,0.2-0.8,3.8-5.2h3.7l-4.6,5.7l5,6.3h-3.7l-4.2-5.8V22h-3V6h3V15.2z"></path><path d="M58.5,21.3c-1.5,0.5-2.7,0.6-4.2,0.6c-3.6,0-5.8-1.8-5.8-6c0-3.1,1.9-5.9,5.5-5.9s4.9,2.5,4.9,4.9c0,0.8,0,1.5-0.1,2h-7.3 c0.1,2.5,1.5,2.8,3.6,2.8c1.1,0,2.2-0.3,3.4-0.7C58.5,19,58.5,21.3,58.5,21.3z M56,15c0-1.4-0.5-2.9-2-2.9c-1.4,0-2.3,1.3-2.4,2.9 C51.6,15,56,15,56,15z"></path></svg>
-				</a>
-			</div>
-			<div class="jp-masthead__nav"><span class="dops-button-group"><a href="<?php echo esc_url( $jetpack_admin_url ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Dashboard', 'jetpack' ); ?></a><a href="<?php echo esc_url( $jetpack_admin_url . '#/settings' ); ?>" type="button" class="dops-button is-compact"><?php esc_html_e( 'Settings', 'jetpack' ); ?></a></span></div>
+
+	<div id="jp-stats-wrap">
+		<div class="wrap">
+			<h2><?php esc_html_e( 'Site Stats', 'jetpack' ); ?> <?php if ( current_user_can( 'jetpack_manage_modules' ) ) : ?><a style="font-size:13px;" href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack&configure=stats' ) ); ?>"><?php esc_html_e( 'Configure', 'jetpack' ); ?></a><?php endif; ?></h2>
+		</div>
+		<div id="stats-loading-wrap" class="wrap">
+		<p class="hide-if-no-js"><img width="32" height="32" alt="<?php esc_attr_e( 'Loading&hellip;', 'jetpack' ); ?>" src="<?php
+				echo esc_url(
+					/**
+					 * Sets external resource URL.
+					 *
+					 * @module stats
+					 *
+					 * @since 1.4.0
+					 *
+					 * @param string $args URL of external resource.
+					 */
+					apply_filters( 'jetpack_static_url', "{$http}://en.wordpress.com/i/loading/loading-64.gif" )
+				); ?>" /></p>
+		<p style="font-size: 11pt; margin: 0;"><a href="https://wordpress.com/stats/<?php echo esc_attr( $domain ); ?>" target="_blank"><?php esc_html_e( 'View stats on WordPress.com right now', 'jetpack' ); ?></a></p>
+		<p class="hide-if-js"><?php esc_html_e( 'Your Site Stats work better with JavaScript enabled.', 'jetpack' ); ?><br />
+		<a href="<?php echo esc_url( $nojs_url ); ?>"><?php esc_html_e( 'View Site Stats without JavaScript', 'jetpack' ); ?></a>.</p>
 		</div>
 	</div>
-	<div id="jp-stats-wrap">
-<div class="wrap">
-	<h2><?php esc_html_e( 'Site Stats', 'jetpack' ); ?> <?php if ( current_user_can( 'jetpack_manage_modules' ) ) : ?><a style="font-size:13px;" href="<?php echo esc_url( admin_url( 'admin.php?page=jetpack&configure=stats' ) ); ?>"><?php esc_html_e( 'Configure', 'jetpack' ); ?></a><?php endif; ?></h2>
-</div>
-<div id="stats-loading-wrap" class="wrap">
-<p class="hide-if-no-js"><img width="32" height="32" alt="<?php esc_attr_e( 'Loading&hellip;', 'jetpack' ); ?>" src="<?php
-		echo esc_url(
-			/**
-			 * Sets external resource URL.
-			 *
-			 * @module stats
-			 *
-			 * @since 1.4.0
-			 *
-			 * @param string $args URL of external resource.
-			 */
-			apply_filters( 'jetpack_static_url', "{$http}://en.wordpress.com/i/loading/loading-64.gif" )
-		); ?>" /></p>
-<p style="font-size: 11pt; margin: 0;"><a href="https://wordpress.com/stats/<?php echo esc_attr( $domain ); ?>" target="_blank"><?php esc_html_e( 'View stats on WordPress.com right now', 'jetpack' ); ?></a></p>
-<p class="hide-if-js"><?php esc_html_e( 'Your Site Stats work better with JavaScript enabled.', 'jetpack' ); ?><br />
-<a href="<?php echo esc_url( $nojs_url ); ?>"><?php esc_html_e( 'View Site Stats without JavaScript', 'jetpack' ); ?></a>.</p>
-</div>
-</div>
-<div class="jp-footer">
-	<ul class="jp-footer__links">
-		<li class="jp-footer__link-item">
-			<a href="https://jetpack.com" target="_blank" rel="noopener noreferrer" class="jp-footer__link" title="<?php esc_html_e( 'Jetpack version', 'jetpack' ); ?>">Jetpack <?php echo JETPACK__VERSION; ?></a>
-		</li>
-		<li class="jp-footer__link-item">
-			<a href="https://wordpress.com/tos/" target="_blank" rel="noopener noreferrer" title="<?php esc_html__( 'WordPress.com Terms of Service', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Terms', 'Navigation item', 'jetpack' ); ?></a>
-		</li>
-		<li class="jp-footer__link-item">
-			<a href="<?php echo esc_url( $jetpack_admin_url . '#/privacy' ); ?>" rel="noopener noreferrer" title="<?php esc_html_e( 'Automattic\'s Privacy Policy', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Privacy', 'Navigation item', 'jetpack' ); ?></a>
-		</li>
-		<li class="jp-footer__link-item">
-			<a href="<?php echo esc_url( admin_url() . 'admin.php?page=jetpack-debugger' ); ?>" title="<?php esc_html_e( 'Test your site\'s compatibility with Jetpack.', 'jetpack' ); ?>" class="jp-footer__link"><?php echo esc_html_x( 'Debug', 'Navigation item', 'jetpack' ); ?></a>
-		</li>
-	</ul>
-</div>
-</div>
 <?php
 		return;
 	}
diff --git a/views/admin/network-admin-alert.php b/views/admin/network-admin-alert.php
index 2d14d209fdc41..434b80f172dc6 100644
--- a/views/admin/network-admin-alert.php
+++ b/views/admin/network-admin-alert.php
@@ -1,9 +1,6 @@
-<div id="message" class="updated jetpack-message jp-connect" style="display:block !important;">
-		<div class="jetpack-wrap-container">
-			<div class="jetpack-text-container">
-				<h2>
-					<?php echo $data['notice']; ?>
-				</h2>
-			</div>
-		</div>
-</div>
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */
\ No newline at end of file
diff --git a/views/admin/network-admin-footer.php b/views/admin/network-admin-footer.php
index 3229f00e7bb0d..434b80f172dc6 100644
--- a/views/admin/network-admin-footer.php
+++ b/views/admin/network-admin-footer.php
@@ -1,30 +1,6 @@
-		<div id="survey" class="jp-survey">
-				<div class="jp-survey-container">
-					<div class="jp-survey-text">
-						<h4><?php _e( 'Have feedback on Jetpack?', 'jetpack' ); ?></h4>
-						<br />
-						<?php _e( 'Answer a short survey to let us know how we&#8217;re doing and what to add in the future.', 'jetpack' ); ?>
-					</div>
-					<div class="jp-survey-button-container">
-						<p class="submit">
-							<a id="jp-survey-button" class="button-primary" target="_blank" rel="noopener noreferrer" href="https://jetpack.com/survey/?rel=<?php echo esc_attr( JETPACK__VERSION ); ?>">
-								<?php _e( 'Take Survey', 'jetpack' ); ?>
-							</a>
-						</p>
-					</div>
-				</div>
-			</div>
-
-			<div id="jp-footer">
-				<p class="automattic"><?php _e( 'An <span>Automattic</span> Airline', 'jetpack' ) ?></p>
-				<p class="small">
-					<a href="https://jetpack.com/" target="_blank" rel="noopener noreferrer">Jetpack <?php echo esc_html( JETPACK__VERSION ); ?></a> |
-					<a href="https://automattic.com/privacy/" target="_blank" rel="noopener noreferrer"><?php _e( 'Privacy Policy', 'jetpack' ); ?></a> |
-					<a href="https://wordpress.com/tos/" target="_blank" rel="noopener noreferrer"><?php _e( 'Terms of Service', 'jetpack' ); ?></a> |
-<?php if ( current_user_can( 'manage_options' ) ) : ?>
-					<a href="<?php echo Jetpack::admin_url( array(	'page' => 'jetpack-debugger' ) ); ?>"><?php _e( 'Debug', 'jetpack' ); ?></a> |
-<?php endif; ?>
-					<a href="https://jetpack.com/support/" target="_blank" rel="noopener noreferrer"><?php _e( 'Support', 'jetpack' ); ?></a>
-				</p>
-			</div>
-		</div>
+<?php
+/**
+ * Deprecated. No longer needed.
+ *
+ * @package Jetpack
+ */
\ No newline at end of file
diff --git a/views/admin/network-admin-header.php b/views/admin/network-admin-header.php
index 8782ed7495c10..2bbe4cf979314 100644
--- a/views/admin/network-admin-header.php
+++ b/views/admin/network-admin-header.php
@@ -1,14 +1,4 @@
-	<div class="wrap" id="jetpack-settings">
-
-			<div id="jp-header"<?php if ( $data['is_connected'] ) : ?> class="small"<?php endif; ?>>
-				<div id="jp-clouds">
-					<h3><?php _e( 'Jetpack by WordPress.com', 'jetpack' ) ?></h3>
-				</div>
-			</div>
-
-			<h2 style="display: none"></h2> <!-- For WP JS message relocation -->
-
-			<?php
-				Jetpack::init()->load_view( 'admin/network-activated-notice.php' );
-				/** This action is already documented in views/admin/admin-page.php */
-				do_action( 'jetpack_notices' );
+<?php
+	Jetpack::init()->load_view( 'admin/network-activated-notice.php' );
+	/** This action is already documented in views/admin/admin-page.php */
+	do_action( 'jetpack_notices' );
diff --git a/views/admin/network-settings.php b/views/admin/network-settings.php
index f353c64dffc08..00d23ba416a98 100644
--- a/views/admin/network-settings.php
+++ b/views/admin/network-settings.php
@@ -1,11 +1,11 @@
 <?php extract( $data ); ?>
 
 <?php if ( isset( $_GET['updated'] ) && 'true' == $_GET['updated'] ) : ?>
-	<div class="updated"><?php esc_html_e( 'Jetpack Network Settings Updated!', 'jetpack' ); ?></div>
+	<div class="updated"><p><?php esc_html_e( 'Jetpack Network Settings Updated!', 'jetpack' ); ?></p></div>
 <?php endif; ?>
 
 <?php if ( isset( $_GET['error'] ) && 'jetpack_protect_whitelist' == $_GET['error'] ) : ?>
-	<div class="error"><?php esc_html_e( 'One of your IP addresses was not valid.', 'jetpack' ); ?></div>
+	<div class="error"><p><?php esc_html_e( 'One of your IP addresses was not valid.', 'jetpack' ); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap">