diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index 742e05db97..60c6d21287 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -22,8 +22,8 @@ tinyMCE.init({
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "left",
 	theme_advanced_path_location : "bottom",
-	entity_encoding : "numeric",
-	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|width|height|align],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+	entity_encoding : "raw",
+	extended_valid_elements : "a[id|href|title|onclick],img[class|src|alt|title|width|height|align]",
 	plugins : "emotions"
 });
 </script>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index d26d68d5ea..f239364f12 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -88,7 +88,7 @@ if ('view' == $mode) {
 				$class .= ' alternate';
 			echo "<li class='$class'>";
 ?>		
-        <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
+        <p><strong><?php _e('Name:') ?></strong> <?php comment_author() ?> <?php if ($comment->comment_author_email) { ?>| <strong><?php _e('E-mail:') ?></strong> <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url ) { ?> | <strong><?php _e('URI:') ?></strong> <?php comment_author_url_link() ?> <?php } ?>| <strong><?php _e('IP:') ?></strong> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
 		
 		<?php comment_text() ?>
 
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 0effeb9d4b..44f9bb10ca 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -48,13 +48,11 @@ if (empty($post->post_status)) $post->post_status = 'draft';
 <?php echo $form_extra ?>
 <?php if (isset($_GET['message']) && 2 > $_GET['message']) : ?>
 <script type="text/javascript">
-<!--
 function focusit() {
 	// focus on first input field
 	document.post.title.focus();
 }
 window.onload = focusit;
-//-->
 </script>
 <?php endif; ?>
 <div id="poststuff">
@@ -171,7 +169,7 @@ if ('publish' != $post_status || 0 == $post_ID) {
 	<input name="referredby" type="hidden" id="referredby" value="<?php echo wp_specialchars($_SERVER['HTTP_REFERER']); ?>" />
 </p>
 
-<?php do_action('edit_form_advanced', ''); ?>
+<?php do_action('edit_form_advanced'); ?>
 
 <div id="advancedstuff" class="dbx-group" >
 
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 37dbef65b5..1ed08db3cc 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -103,10 +103,11 @@ foreach ($rss->items as $item ) {
 </div>
 <?php } ?>
 
+<?php do_action('activity_box_end'); ?>
 </div>
 
 <h2><?php _e('Dashboard'); ?></h2>
-<p><?php _e('Below is the latest news from the official WordPress development blog, click on a title to read the full entry.'); ?></p>
+<p><?php _e("Below is the latest news from the official WordPress development blog, click on a title to read the full entry. If you need help with WordPress please see our <a href='http://codex.wordpress.org/'>great documentation</a> or if that doesn't help visit the <a href='http://wordpress.org/support/'>support forums</a>."); ?></p>
 <?php
 $rss = @fetch_rss('http://wordpress.org/development/feed/');
 if ( isset($rss->items) && 0 != count($rss->items) ) {
diff --git a/wp-admin/post.php b/wp-admin/post.php
index bf6a15ac23..6f454e0256 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -84,7 +84,7 @@ case 'edit':
 
 	<div class="storycontent">
 	<?php 
-	echo apply_filters('the_content', $post->post_content);
+	echo apply_filters('the_content', html_entity_decode($post->post_content) );
 	?>
 	</div>
 	</div>
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index af0b6e6048..350bd327e8 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -53,7 +53,7 @@ $current_stylesheet = $themes[$current_theme]['Stylesheet'];
 <?php } ?>
 </div>
 
-<h2><?php _e('Themes Available'); ?></h2>
+<h2><?php _e('Available Themes'); ?></h2>
 <?php if ( 1 < count($themes) ) { ?>
 <table width="100%" cellpadding="3" cellspacing="3">
 	<tr>
@@ -145,7 +145,7 @@ if (count($broken_themes)) {
 ?>
 
 <h2><?php _e('Get More Themes'); ?></h2>
-<p><?php _e('You can find additional themes for your site in the <a href="http://wordpress.org/extend/themes/">WordPress theme directory</a>. To install a theme you generally just need to upload the theme folder into your <code>wp-content/themes</code> directory. Once a theme is uploaded, you may activate it here.'); ?></p>
+<p><?php _e('You can find additional themes for your site in the <a href="http://wordpress.org/extend/themes/">WordPress theme directory</a>. To install a theme you generally just need to upload the theme folder into your <code>wp-content/themes</code> directory. Once a theme is uploaded, you may activate it on this page.'); ?></p>
 
 </div>
 
diff --git a/wp-admin/tinymce/tiny_mce_src.js b/wp-admin/tinymce/tiny_mce_src.js
index 3cf566b5d0..efa5ee97aa 100644
--- a/wp-admin/tinymce/tiny_mce_src.js
+++ b/wp-admin/tinymce/tiny_mce_src.js
@@ -541,7 +541,7 @@ TinyMCE.prototype._createIFrame = function(replace_element) {
 	if (tinyMCE.isMSIE)
 		iframe.setAttribute("src", this.settings['default_document']);
 
-	iframe.style.width = "98%";
+	iframe.style.width = tinyMCE.settings['area_width'];
 	iframe.style.height = tinyMCE.settings['area_height'];
 
 	// MSIE 5.0 issue
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index ef1a020321..10fe7e99c5 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -153,7 +153,7 @@ textarea, input, select {
 }
 
 .alternate {
-	background: #eee;
+	background: #f1f1f1;
 }
 
 .anchors {
@@ -266,7 +266,7 @@ textarea, input, select {
 }
 
 .wrap h2 {
-	margin: .5em 0;
+	margin: .8em 0 .5em;
 }
 
 #adminmenu {