diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 174a1be027..37f0c4ec11 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -299,7 +299,7 @@ list_meta($metadata);
 <?php do_action('dbx_post_advanced'); ?>
 
 <div id="commentstatusdiv" class="postbox <?php echo postbox_classes('commentstatusdiv', 'post'); ?>">
-<h3><?php _e('Discussion') ?></h3>
+<h3><?php _e('Comments & Pings') ?></h3>
 <div class="inside">
 <input name="advanced_view" type="hidden" value="1" />
 <label for="comment_status" class="selectit">
@@ -310,7 +310,7 @@ list_meta($metadata);
 </div>
 
 <div id="passworddiv" class="postbox <?php echo postbox_classes('passworddiv', 'post'); ?>">
-<h3><?php _e('Post Password') ?></h3>
+<h3><?php _e('Password Protect This Post') ?></h3>
 <div class="inside">
 <input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" />
 </div>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 19ead9e55b..062b1c1b50 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -186,7 +186,7 @@ list_meta($metadata);
 </div>
 
 <div id="pagecommentstatusdiv" class="postbox <?php echo postbox_classes('pagecommentstatusdiv', 'page'); ?>">
-<h3><?php _e('Discussion') ?></h3>
+<h3><?php _e('Comments & Pings') ?></h3>
 <div class="inside">
 <input name="advanced_view" type="hidden" value="1" />
 <label for="comment_status" class="selectit">
@@ -197,7 +197,7 @@ list_meta($metadata);
 </div>
 
 <div id="pagepassworddiv" class="postbox <?php echo postbox_classes('pagepassworddiv', 'page'); ?>">
-<h3><?php _e('Page Password') ?></h3>
+<h3><?php _e('Password Protect This Page') ?></h3>
 <div class="inside">
 <input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" />
 </div>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 359972e0f9..ad8b4df87c 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -54,13 +54,34 @@ include('./admin-header.php');
 </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is') ?> </th>
-<td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Times in the blog should differ by') ?> </th>
-<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
-<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
+<th scope="row"><?php _e('Your Timezone') ?> </th>
+<td>
+<select name="gmt_offset">
+<?php 
+$current_offset = get_option('gmt_offset');
+foreach ( range(-12, 12, 0.5) as $offset ) {
+	if ( 0 < $offset )
+		$offset_name = '+' . $offset;
+	elseif ( 0 == $offset )
+		$offset_name = '';
+	else
+		$offset_name = (string) $offset;
+
+	$offset_name = str_replace('.5', ':30', $offset_name);
+
+	$selected = '';
+	if ( $current_offset == $offset ) {
+		$selected = " selected='selected'";
+		$current_offset_name = $offset_name;
+	}
+	echo "<option value=\"$offset\"$selected>" . sprintf(__('UTC %s'), $offset_name) . '</option>';
+}
+?>
+</select>
+<?php _e('hours') ?><br />
+<?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), gmdate(__('Y-m-d G:i:s'))); ?><br />
+<?php if ($current_offset) printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, gmdate(__('Y-m-d G:i:s'), current_time('timestamp'))); ?>
+</td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Date Format') ?></th>