diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index b4b5de2ea..891ff6bf0 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -22,7 +22,7 @@ if (0 == $post_ID) {
 if (get_settings('use_pingback')) {
 	$form_pingback = '<input type="checkbox" class="checkbox" name="post_pingback" value="1" ';
 	if ( get_settings('default_pingback_flag') ) $form_pingback .= 'checked="checked" ';
-	$form_pingback .= 'tabindex="7" id="pingback" /> <label for="pingback">' . __('<strong>PingBack</strong> the <acronym title="Uniform Resource Locators">URL</acronym>s in this post') . '</label> <a href="http://wordpress.org/docs/reference/post/#pingback" title="' . __('Help on Pingbacks') . '">?</a><br />';
+	$form_pingback .= 'tabindex="7" id="pingback" /> <label for="pingback">' . __('<strong>PingBack</strong> the <abbr title="Universal Resource Identifier">URI</abbr>s in this post') . '</label> <a href="http://wordpress.org/docs/reference/post/#pingback" title="' . __('Help on Pingbacks') . '">?</a><br />';
 } else {
 	$form_pingback = '';
 }
@@ -30,7 +30,7 @@ if (get_settings('use_pingback')) {
 $colspan = 2;
 $form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';
 if (get_settings('use_trackback')) {
-	$form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="' . __('Help on trackbacks') . '">' . __('<strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a>') . '</label> ' . __('(Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with spaces.)') . '<br />
+	$form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="' . __('Help on trackbacks') . '">' . __('<strong>TrackBack</strong> an <abbr title="Universal Resource Identifier">URI</abbr></a>') . '</label> ' . __('(Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)') . '<br />
 	<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. str_replace("\n", ' ', $to_ping) .'" /></p>';
 	if ('' != $pinged) {
 		$pings .= '<p>'. __('Already pinged:') . '</p><ul>';
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index f10b501f5..7fb59ac3c 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -11,12 +11,12 @@ $form_extra = '';
 if (get_settings('use_pingback')) {
 	$form_pingback = '<input type="checkbox" class="checkbox" name="post_pingback" value="1" ';
 	if ($post_pingback) $form_pingback .= 'checked="checked" ';
-	$form_pingback .= 'tabindex="7" id="pingback" /> <label for="pingback">' . sprintf(__('<strong>PingBack</strong> the <acronym title="Uniform Resource Locators">URL</acronym>s in this post</label> <a href="%s" title="Help on Pingbacks">?</a><br />'), 'http://wordpress.org/docs/reference/post/#pingback');
+	$form_pingback .= 'tabindex="7" id="pingback" /> <label for="pingback">' . sprintf(__('<strong>PingBack</strong> the <abbr title="Universal Resource Identifier">URI</abbr>s in this post</label> <a href="%s" title="Help on Pingbacks">?</a><br />'), 'http://wordpress.org/docs/reference/post/#pingback');
 } else {
 	$form_pingback = '';
 }
 if (get_settings('use_trackback')) {
-	$form_trackback = '<p><label for="trackback">' . sprintf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a>:</label> (Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') .
+	$form_trackback = '<p><label for="trackback">' . sprintf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') .
 	'<input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>';
 	if ('' != $pinged) {
 		$form_trackback .= '<p>' . __('Already pinged:') . '</p><ul>';
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 64816d0f4..cf7d836a2 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -175,7 +175,7 @@ default:
 	<th><?php _e('Nickname') ?></th>
 	<th><?php _e('Name') ?></th>
 	<th><?php _e('E-mail') ?></th>
-	<th><?php _e('URI') ?></th>
+	<th><?php _e('Website') ?></th>
 	<th><?php _e('Level') ?></th>
 	<th><?php _e('Posts') ?></th>
 	</tr>
@@ -228,7 +228,7 @@ default:
 		<th><?php _e('Nickname') ?></th>
 		<th><?php _e('Name') ?></th>
 		<th><?php _e('E-mail') ?></th>
-		<th><?php _e('URI') ?></th>
+		<th><?php _e('Website') ?></th>
 		<th><?php _e('Level') ?></th>
 	</tr>
 	<?php
@@ -270,11 +270,11 @@ echo "\n<tr $style>
 <h2><?php _e('Add User') ?></h2>
 <?php printf(__('<p>Users can <a href="%s/wp-register.php">register themselves</a> or you can manually create users here.</p>'), get_settings('siteurl')); ?>
 <form action="" method="post" name="adduser" id="adduser">
-  <table border="0" cellspacing="5" cellpadding="3">
+  <table class="editform" width="100%" cellspacing="2" cellpadding="5">
     <tr>
-      <th scope="row"><?php _e('Nickname') ?>
+      <th scope="row" width="33%"><?php _e('Nickname') ?>
       <input name="action" type="hidden" id="action" value="adduser" /></th>
-      <td><input name="user_login" type="text" id="user_login" /></td>
+      <td width="66%"><input name="user_login" type="text" id="user_login" /></td>
     </tr>
     <tr>
       <th scope="row"><?php _e('First Name') ?> </th>
@@ -285,11 +285,11 @@ echo "\n<tr $style>
       <td><input name="lastname" type="text" id="lastname" /></td>
     </tr>
     <tr>
-      <th scope="row"><?php _e('Email') ?></th>
+      <th scope="row"><?php _e('E-mail') ?></th>
       <td><input name="email" type="text" id="email" /></td>
     </tr>
     <tr>
-      <th scope="row"><?php _e('URI') ?></th>
+      <th scope="row"><?php _e('Website') ?></th>
       <td><input name="uri" type="text" id="uri" /></td>
     </tr>
     <tr>