diff --git a/wp-admin/css/dashboard.css b/wp-admin/css/dashboard.css
index 2920de9b5..828247c93 100644
--- a/wp-admin/css/dashboard.css
+++ b/wp-admin/css/dashboard.css
@@ -51,8 +51,6 @@
 
 #rightnow a {
 	font-weight: bold;
-	border-bottom-width: 1px;
-	border-botom-style: solid
 }
 
 div#dashboard-widgets {
diff --git a/wp-admin/index.php b/wp-admin/index.php
index dc41a20d4..cd6de1765 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -80,7 +80,7 @@ $sidebars_widgets = wp_get_sidebars_widgets();
 $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ) );
 $widgets_text = sprintf( __ngettext( '%d widget', '%d widgets', $num_widgets ), $num_widgets );
 ?>
-<p><?php printf( __( 'You are using %1$s theme with %2$s.' ), $ct->title, "<a href='widgets.php'>$widgets_text</a>" ); ?> <a href="themes.php" class="rbutton"><?php _e('Change Theme'); ?></a> You're using BetaPress TODO.</p>
+<p><?php printf( __( 'You use the %1$s theme with %2$s.' ), $ct->title, "<a href='widgets.php'>$widgets_text</a>" ); ?> <a href="themes.php" class="button"><?php _e('Change Theme'); ?></a> You're using BetaPress TODO.</p>
 <?php do_action( 'rightnow_end' ); ?>
 <?php do_action( 'activity_box_end' ); ?>
 </div><!-- rightnow -->
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 8dda5e280..168a76bfc 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -101,7 +101,6 @@ default:
 <div class="bordertitle">
 	<h2 style="border: none; padding-bottom: 0px;"><?php _e('Plugin Editor'); ?></h2>
 </div>
-<br style="clear: both;" />
 <div class="tablenav" style="margin-right: 210px;">
 <div style="float: left;">
 <big><strong><?php
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 13b81ec9f..101ce56b2 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -107,7 +107,6 @@ $desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "
 		<input type="submit" name="Submit" value="<?php _e('Select') ?>" class="button" />
 	</form>
 </div>
-<br style="clear: both;" />
 <div class="tablenav" style="margin-right: 210px;">
 <div style="float: left;">
 <big><strong><?php echo sprintf($desc_header, $file_show); ?></big>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 5c698771d..c47cafe3d 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -291,8 +291,6 @@ unset($role_links);
 	<input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
 	</p>
 
-<br style="clear:both;" />
-
 <div class="tablenav">
 
 <?php if ( $wp_user_search->results_are_paged() ) : ?>
@@ -355,8 +353,6 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 </tbody>
 </table>
 
-<br style="clear:both;" />
-
 <div class="tablenav">
 
 <?php if ( $wp_user_search->results_are_paged() ) : ?>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 08b0e6496..590b5ea65 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -153,9 +153,11 @@ form#upload #post_content {
 
 .submit input, .button, .button-secondary {
 	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-	padding: 4px 6px;
+	padding: 3px 5px;
 	border: none;
 	font-size: 13px;
+	border-width: 1px;
+	border-style: solid;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
@@ -553,9 +555,11 @@ a.view-comment-post-link {
 }
 #wphead #viewsite a {
 	font: 14px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-	padding: 6px;
+	padding: 4px;
 	display: block;
 	letter-spacing: normal;
+	border-width: 1px;
+	border-style: solid;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
@@ -875,7 +879,7 @@ html, body {
 	margin-bottom: 10px;
 	margin-right: 8px;
 	border-width: 1px;
-	border-style: 1px;
+	border-style: solid;
 }
 
 #poststuff .inside {
@@ -1032,8 +1036,9 @@ html, body {
 
 .submitbox .submit input {
 	margin-bottom: 8px;
-	margin-right: 23pxpx;
+	margin-right: 3px;
 	padding: 6px 4px;
+	border: none;
 }
 
 /* Categories */
@@ -1204,6 +1209,7 @@ ul.view-switch a {
 
 ul.view-switch li.current {
 	border: none;
+	font-weight: bold;
 	-moz-border-radius-topleft: 3px;
 	-khtml-border-top-left-radius: 3px;
 	-webkit-border-top-left-radius: 3px;
@@ -1250,4 +1256,8 @@ ul.view-switch li.current {
 
 #the-comment-list td.comment p {
 	margin-left: 8px;
+}
+
+#templateside ul li a {
+	text-decoration: none;
 }
\ No newline at end of file