diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 3621bd72da..e78bfa4708 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -144,7 +144,7 @@ if ($post_ID) {
 <p><?php printf($stamp, $date, $time); ?>
 &nbsp;<a href="#edit_timestamp" class="edit-timestamp"><?php _e('Edit') ?></a></p>
 
-<div id='timestamp'><?php touch_time(($action == 'edit')); ?></div>
+<div id='timestampdiv'><?php touch_time(($action == 'edit')); ?></div>
 
 </div>
 
@@ -297,7 +297,7 @@ list_meta($metadata);
 <?php do_action('dbx_post_advanced'); ?>
 
 <div id="commentstatusdiv" class="postbox <?php echo postbox_classes('commentstatusdiv', 'post'); ?>">
-<h3><?php _e('Comments & Pings') ?></h3>
+<h3><?php _e('Comments &amp; Pings') ?></h3>
 <div class="inside">
 <input name="advanced_view" type="hidden" value="1" />
 <label for="comment_status" class="selectit">
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 54fbc1695d..558a28b9f7 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -73,7 +73,7 @@ $time = mysql2date(get_option('time_format'), $comment->comment_date);
 <p><?php printf($stamp, $date, $time); ?>
 &nbsp;<a href="#edit_timestamp" class="edit-timestamp"><?php _e('Edit') ?></a></p>
 
-<div id='timestamp'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
+<div id='timestampdiv'><?php touch_time(('editcomment' == $action), 0, 5); ?></div>
 
 </div>
 
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 4e111400a7..28e588d011 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -122,7 +122,7 @@ if ($post_ID) {
 <p><?php printf($stamp, $date, $time); ?>
 &nbsp;<a href="#edit_timestamp" class="edit-timestamp"><?php _e('Edit') ?></a></p>
 
-<div id='timestamp'><?php touch_time(($action == 'edit')); ?></div>
+<div id='timestampdiv'><?php touch_time(($action == 'edit')); ?></div>
 
 </div>
 
@@ -194,7 +194,7 @@ list_meta($metadata);
 </div>
 
 <div id="pagecommentstatusdiv" class="postbox <?php echo postbox_classes('pagecommentstatusdiv', 'page'); ?>">
-<h3><?php _e('Comments & Pings') ?></h3>
+<h3><?php _e('Comments &amp; Pings') ?></h3>
 <div class="inside">
 <input name="advanced_view" type="hidden" value="1" />
 <label for="comment_status" class="selectit">
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 17b400a66d..1ca0e4a2bc 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -773,7 +773,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0 ) {
 	if ( (int) $tab_index > 0 )
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
 
-	echo '<legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> <label for="timestamp">'.__( 'Edit timestamp' ).'</label></legend>';
+	echo '<input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> <label for="timestamp">'.__( 'Edit timestamp' ).'</label>';
 
 	$time_adj = time() + (get_option( 'gmt_offset' ) * 3600 );
 	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
diff --git a/wp-admin/js/comment.js b/wp-admin/js/comment.js
index 77a211e5ec..ed9b0e1229 100644
--- a/wp-admin/js/comment.js
+++ b/wp-admin/js/comment.js
@@ -1,12 +1,12 @@
 addLoadEvent( function() {
 	add_postbox_toggles('comment');
 
-	jQuery('#timestamp').css('display', 'none');
+	jQuery('#timestampdiv').css('display', 'none');
 	jQuery('.edit-timestamp').click(function () {
-		if (jQuery('#timestamp').is(":hidden")) {
-			jQuery('#timestamp').slideDown("normal");
+		if (jQuery('#timestampdiv').is(":hidden")) {
+			jQuery('#timestampdiv').slideDown("normal");
 		} else {
-			jQuery('#timestamp').hide();
+			jQuery('#timestampdiv').hide();
 		}
     });
 });
diff --git a/wp-admin/js/page.js b/wp-admin/js/page.js
index 8bfc45e45e..af9bb68dea 100644
--- a/wp-admin/js/page.js
+++ b/wp-admin/js/page.js
@@ -5,12 +5,12 @@ addLoadEvent( function() {
 	// hide advanced slug field
 	jQuery('#pageslugdiv').hide();
 
-	jQuery('#timestamp').css('display', 'none');
+	jQuery('#timestampdiv').css('display', 'none');
 	jQuery('.edit-timestamp').click(function () {
-		if (jQuery('#timestamp').is(":hidden")) {
-			jQuery('#timestamp').slideDown("normal");
+		if (jQuery('#timestampdiv').is(":hidden")) {
+			jQuery('#timestampdiv').slideDown("normal");
 		} else {
-			jQuery('#timestamp').hide();
+			jQuery('#timestampdiv').hide();
 		}
     });
 });
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index 84114989a2..5e051c8c70 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -144,12 +144,12 @@ addLoadEvent( function() {
 	} );
 	jQuery('.categorychecklist :checkbox').change( syncChecks ).filter( ':checked' ).change();
 
-	jQuery('#timestamp').css('display', 'none');
+	jQuery('#timestampdiv').css('display', 'none');
 	jQuery('.edit-timestamp').click(function () {
-		if (jQuery('#timestamp').is(":hidden")) {
-			jQuery('#timestamp').slideDown("normal");
+		if (jQuery('#timestampdiv').is(":hidden")) {
+			jQuery('#timestampdiv').slideDown("normal");
 		} else {
-			jQuery('#timestamp').hide();
+			jQuery('#timestampdiv').hide();
 		}
     });
 });
\ No newline at end of file