Index: src/wp-admin/edit-form-advanced.php
===================================================================
--- src/wp-admin/edit-form-advanced.php	(revision 42128)
+++ src/wp-admin/edit-form-advanced.php	(working copy)
@@ -627,8 +627,12 @@
 do_action( 'edit_form_after_title', $post );
 
 if ( post_type_supports($post_type, 'editor') ) {
+	$_wp_editor_expand_class = '';
+	if ( $_wp_editor_expand ) {
+		$_wp_editor_expand_class = ' wp-editor-expand';
+	}
 ?>
-<div id="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">
+<div id="postdivrich" class="postarea<?php echo $_wp_editor_expand_class; ?>">
 
 <?php wp_editor( $post->post_content, 'content', array(
 	'_content_editor_dfw' => $_content_editor_dfw,
Index: src/wp-admin/includes/widgets.php
===================================================================
--- src/wp-admin/includes/widgets.php	(revision 42128)
+++ src/wp-admin/includes/widgets.php	(working copy)
@@ -181,6 +181,8 @@
 	$id_format = $widget['id'];
 	$widget_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $widget_id;
+	$width = isset($control['width']) ? $control['width'] : '';
+	$height = isset($control['height']) ? $control['height'] : '';
 	$multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
 	$add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
 
@@ -244,12 +246,17 @@
 	} else {
 		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n";
 	}
+
+	$noform_class = '';
+	if ( 'noform' === $has_form ) {
+		$noform_class = ' widget-control-noform';
+	}
 	?>
 	<?php echo $after_widget_content; ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-	<input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
-	<input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
+	<input type="hidden" name="widget-width" class="widget-width" value="<?php echo esc_attr($width); ?>" />
+	<input type="hidden" name="widget-height" class="widget-height" value="<?php echo esc_attr($height); ?>" />
 	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
 	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
@@ -262,7 +269,7 @@
 				<button type="button" class="button-link widget-control-close"><?php _e( 'Done' ); ?></button>
 			</span>
 		</div>
-		<div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
+		<div class="alignright<?php echo $noform_class; ?>">
 			<?php submit_button( __( 'Save' ), 'primary widget-control-save right', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
 			<span class="spinner"></span>
 		</div>
Index: src/wp-admin/nav-menus.php
===================================================================
--- src/wp-admin/nav-menus.php	(revision 42128)
+++ src/wp-admin/nav-menus.php	(working copy)
@@ -589,12 +589,17 @@
 			__( 'Manage with Live Preview' )
 		);
 	endif;
+
+	$nav_tab_active_class = '';
+	if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
+		$nav_tab_active_class = ' nav-tab-active';
+	}
 	?>
 
 	<hr class="wp-header-end">
 
 	<h2 class="nav-tab-wrapper wp-clearfix">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
+		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
 			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php
@@ -630,9 +635,15 @@
 						<td class="menu-location-menus">
 							<select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
 								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
-								<?php foreach ( $nav_menus as $menu ) : ?>
-									<?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-									<option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
+								<?php
+									foreach ( $nav_menus as $menu ) :
+										$data_orig = '';
+										$selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id;
+										if ( $selected ) {
+											$data_orig = 'data-orig="true"';
+										}
+										?>
+									<option <?php echo $data_orig; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
 										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
 									</option>
 								<?php endforeach; ?>
@@ -739,7 +750,13 @@
 	<div id="menu-management-liquid">
 		<div id="menu-management">
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
-				<div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+			<?php
+				$new_screen_class = '';
+				if ( $add_new_screen ) {
+					$new_screen_class = 'blank-slate';
+				}
+			?>
+				<div class="menu-edit <?php echo $new_screen_class; ?>">
 					<input type="hidden" name="nav-menu-data">
 					<?php
 					wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
@@ -770,8 +787,14 @@
 						<div id="post-body-content" class="wp-clearfix">
 							<?php if ( ! $add_new_screen ) : ?>
 							<h3><?php _e( 'Menu Structure' ); ?></h3>
-							<?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
-							<div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
+							<?php
+								$hide_style = '';
+								if ( isset( $menu_items ) && 0 == count( $menu_items ) ) {
+									$hide_style = 'style="display: none;"';
+								}
+								$starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' );
+							?>
+							<div class="drag-instructions post-body-plain" <?php echo $hide_style; ?>>
 								<p><?php echo $starter_copy; ?></p>
 							</div>
 							<?php
Index: src/wp-admin/options-general.php
===================================================================
--- src/wp-admin/options-general.php	(revision 42128)
+++ src/wp-admin/options-general.php	(working copy)
@@ -68,16 +68,25 @@
 <p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
 </tr>
 
-<?php if ( !is_multisite() ) { ?>
+<?php
+	if ( !is_multisite() ) {
+		$wp_site_url_class = $wp_home_class = '';
+		if ( defined( 'WP_SITEURL' ) ) {
+			$wp_site_url_class = ' disabled';
+		}
+		if ( defined( 'WP_HOME' ) ) {
+			$wp_home_class = ' disabled';
+		}
+?>
 
 <tr>
 <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php echo $wp_site_url_class; ?>" /></td>
 </tr>
 
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php echo $wp_home_class; ?>" />
 <?php if ( ! defined( 'WP_HOME' ) ) : ?>
 <p class="description" id="home-description"><?php
 	printf(
Index: src/wp-admin/themes.php
===================================================================
--- src/wp-admin/themes.php	(revision 42128)
+++ src/wp-admin/themes.php	(working copy)
@@ -250,8 +250,13 @@
 foreach ( $themes as $theme ) :
 	$aria_action = esc_attr( $theme['id'] . '-action' );
 	$aria_name   = esc_attr( $theme['id'] . '-name' );
+
+	$active_class = '';
+	if ( $theme['active'] ) {
+		$active_class = ' active';
+	}
 	?>
-<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
+<div class="theme<?php echo $active_class; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
 	<?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
 		<div class="theme-screenshot">
 			<img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />