diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index cc9c1b437f..1c0d9fab85 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -174,7 +174,7 @@ if ( $page_links )
 
 <div class="alignleft">
 <select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -214,7 +214,7 @@ if ( $page_links )
 
 <div class="alignleft">
 <select name="action2">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 5d443922a0..5f621653f8 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -110,7 +110,7 @@ if ( $page_links )
 
 <div class="alignleft">
 <select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -166,7 +166,7 @@ if ( $page_links )
 
 <div class="alignleft">
 <select name="action2">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index a62b79233a..747e5b9b3f 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -411,5 +411,5 @@ if ( $link_id ) : ?>
 </div>
 </div>
 
-</div>
 </form>
+</div>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index fdb1bc37d0..7848cbc3fe 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -177,7 +177,7 @@ if ( $page_links )
 
 <div class="alignleft">
 <select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -220,7 +220,7 @@ if ( $page_links )
 
 <div class="alignleft">
 <select name="action2">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 2de4493a5b..82c822245a 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -370,7 +370,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 			<p class="comment-actions"><?php echo $actions_string; ?></p>
 
 			<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-				<textarea class="comment"><?php echo $comment->comment_content; ?></textarea>
+				<textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
 				<div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
 				<div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
 				<div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div>
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 298e326802..4d87a89ac8 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1016,7 +1016,7 @@ function inline_edit_row( $type ) {
 				<div <?php echo $attributes ?> title="<?php _e('Tags'); ?>">
 					<div class="title"><?php _e('Tags'); ?></div>
 					<div class="in">
-					<textarea cols="22" rows="1" type="text" name="tags_input" class="tags_input"></textarea>
+					<textarea cols="22" rows="1" name="tags_input" class="tags_input"></textarea>
 					</div>
 				</div>
 				<?php }
@@ -1871,7 +1871,7 @@ function _wp_comment_row( $comment_id, $mode, $comment_status, $checkbox = true
 				echo "<td $attributes>";
 				if ( 'detail' == $mode || 'single' == $mode ) comment_text(); ?>
 				<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-				<textarea class="comment"><?php echo $comment->comment_content; ?></textarea>
+				<textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
 				<div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
 				<div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
 				<div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div>
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 51f523de7c..1cdbec9902 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -135,7 +135,7 @@ echo $select_order;
 
 <div class="alignleft">
 <select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -266,7 +266,7 @@ if ( $links ) {
 
 <div class="alignleft">
 <select name="action2">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 456a3ae8f7..64856c3927 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -57,7 +57,7 @@ if ( isset($_GET['inline']) ) {
 	require_once('admin-header.php'); ?>
 	<div class="wrap">
 
-	<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&upload-page-form=" class="media-upload-form type-form validate" id="file-form">
+	<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&amp;upload-page-form=" class="media-upload-form type-form validate" id="file-form">
 	
 	<?php media_upload_form(); ?>
 	
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 3525127821..1aa22ea2e2 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -134,7 +134,7 @@ foreach ( $offset_range as $offset ) {
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="date_format"><?php _e('Date Format') ?></label></th>
+<th scope="row"><?php _e('Date Format') ?></th>
 <td>
 	<fieldset><legend class="hidden"><?php _e('Date Format') ?></legend>
 <?php
@@ -159,7 +159,7 @@ foreach ( $offset_range as $offset ) {
 
 	echo '	<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom, TRUE );
-	echo '/> ' . __('Custom') . ': </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" size="30" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "</label>\n";
+	echo '/> ' . __('Custom') . ': </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" size="30" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "\n";
 
 	echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') . "</p>\n";
 ?>
@@ -167,7 +167,7 @@ foreach ( $offset_range as $offset ) {
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="time_format"><?php _e('Time Format') ?></label></th>
+<th scope="row"><?php _e('Time Format') ?></th>
 <td>
 	<fieldset><legend class="hidden"><?php _e('Time Format') ?></legend>
 <?php
@@ -191,7 +191,7 @@ foreach ( $offset_range as $offset ) {
 
 	echo '	<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom, TRUE );
-	echo '/> ' . __('Custom') . ': </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" size="30" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "</label>\n";
+	echo '/> ' . __('Custom') . ': </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" size="30" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "\n";
 ?>
 	</fieldset>
 </td>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 6f2367a229..73b4c47042 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -146,7 +146,7 @@ endforeach;
 <?php endif; ?>
 
 <h3><?php _e('Press This') ?></h3>
-<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
+<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
 
 <?php do_settings_sections('writing'); ?>
 
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 00ab1000f7..c37b5a3a8f 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -346,7 +346,7 @@ function print_plugins_table($plugins, $context = '') {
 <div class="tablenav">
 	<div class="alignleft">
 		<select name="action">
-			<option value="" selected><?php _e('Actions'); ?></option>
+			<option value="" selected="selected"><?php _e('Actions'); ?></option>
 			<option value="deactivate-selected"><?php _e('Deactivate'); ?></option>
 		</select>
 		<input type="submit" name="doaction_active" value="<?php _e('Apply'); ?>" class="button-secondary action" />
@@ -368,7 +368,7 @@ function print_plugins_table($plugins, $context = '') {
 <div class="tablenav">
 	<div class="alignleft">
 		<select name="action">
-			<option value="" selected><?php _e('Actions'); ?></option>
+			<option value="" selected="selected"><?php _e('Actions'); ?></option>
 			<option value="activate-selected"><?php _e('Activate'); ?></option>
 <?php if( current_user_can('delete_plugins') ) : ?>
 			<option value="delete-selected"><?php _e('Delete'); ?></option>
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 8a5d10eb5c..a921c34ef5 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -163,7 +163,7 @@ foreach ( $cols as $col => $theme_name ) {
 	$screenshot = $themes[$theme_name]['Screenshot'];
 	$stylesheet_dir = $themes[$theme_name]['Stylesheet Dir'];
 	$preview_link = clean_url( get_option('home') . '/');
-	$preview_link = add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true', 'width' => 600, 'height' => 400 ), $preview_link );
+	$preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true', 'width' => 600, 'height' => 400 ), $preview_link ) );
 	$preview_text = attribute_escape( sprintf( __('Preview of "%s"'), $title ) );
 	$tags = $themes[$theme_name]['Tags'];
 	$thickbox_class = 'thickbox';
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 39d5bf4af9..bae299384e 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -316,7 +316,7 @@ unset($role_links);
 
 <div class="alignleft">
 <select name="action">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
@@ -384,7 +384,7 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 
 <div class="alignleft">
 <select name="action2">
-<option value="" selected><?php _e('Actions'); ?></option>
+<option value="" selected="selected"><?php _e('Actions'); ?></option>
 <option value="delete"><?php _e('Delete'); ?></option>
 </select>
 <input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />