Index: wp-content/themes/twentyeleven/content-aside.php
===================================================================
--- wp-content/themes/twentyeleven/content-aside.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-aside.php	(working copy)
@@ -39,7 +39,7 @@
 			<?php twentyeleven_posted_on(); ?>
 			<?php if ( comments_open() ) : ?>
 			<span class="sep"> | </span>
-			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
Index: wp-content/themes/twentyeleven/content-gallery.php
===================================================================
--- wp-content/themes/twentyeleven/content-gallery.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-gallery.php	(working copy)
@@ -84,7 +84,7 @@
 		<?php if ( $show_sep ) : ?>
 		<span class="sep"> | </span>
 		<?php endif; // End if $show_sep ?>
-		<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+		<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
 		<?php endif; // End if comments_open() ?>
 
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
Index: wp-content/themes/twentyeleven/content-link.php
===================================================================
--- wp-content/themes/twentyeleven/content-link.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-link.php	(working copy)
@@ -39,7 +39,7 @@
 			<?php twentyeleven_posted_on(); ?>
 			<?php if ( comments_open() ) : ?>
 			<span class="sep"> | </span>
-			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
Index: wp-content/themes/twentyeleven/content-page.php
===================================================================
--- wp-content/themes/twentyeleven/content-page.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-page.php	(working copy)
@@ -16,6 +16,8 @@
 	<div class="entry-content">
 		<?php the_content(); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
+	</div><!-- .entry-content -->
+	<footer class="entry-meta">
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
-	</div><!-- .entry-content -->
+	</footer><!-- .entry-meta -->
 </article><!-- #post-<?php the_ID(); ?> -->
Index: wp-content/themes/twentyeleven/content-quote.php
===================================================================
--- wp-content/themes/twentyeleven/content-quote.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-quote.php	(working copy)
@@ -66,7 +66,7 @@
 			<?php if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep ?>
-			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
 			<?php endif; // End if comments_open() ?>
 
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
Index: wp-content/themes/twentyeleven/content-single.php
===================================================================
--- wp-content/themes/twentyeleven/content-single.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-single.php	(working copy)
@@ -27,16 +27,21 @@
 	<footer class="entry-meta">
 		<?php
 			/* translators: used between list items, there is a space after the comma */
+			$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
+			/* translators: used between list items, there is a space after the comma */
 			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
 			if ( '' != $tag_list ) {
 				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+			} elseif ( '' != $categories_list ) {
+				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
 			} else {
-				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+				$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
 			}
+
 			printf(
 				$utility_text,
-				/* translators: used between list items, there is a space after the comma */
-				get_the_category_list( __( ', ', 'twentyeleven' ) ),
+				$categories_list,
 				$tag_list,
 				esc_url( get_permalink() ),
 				the_title_attribute( 'echo=0' ),
Index: wp-content/themes/twentyeleven/content-status.php
===================================================================
--- wp-content/themes/twentyeleven/content-status.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content-status.php	(working copy)
@@ -40,7 +40,7 @@
 			<?php twentyeleven_posted_on(); ?>
 			<?php if ( comments_open() ) : ?>
 			<span class="sep"> | </span>
-			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
Index: wp-content/themes/twentyeleven/content.php
===================================================================
--- wp-content/themes/twentyeleven/content.php	(revision 18306)
+++ wp-content/themes/twentyeleven/content.php	(working copy)
@@ -74,7 +74,7 @@
 			<?php if ( $show_sep ) : ?>
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep ?>
-			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?></span>
 			<?php endif; // End if comments_open() ?>
 
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
Index: wp-content/themes/twentyeleven/functions.php
===================================================================
--- wp-content/themes/twentyeleven/functions.php	(revision 18306)
+++ wp-content/themes/twentyeleven/functions.php	(working copy)
@@ -497,7 +497,7 @@
 		case 'trackback' :
 	?>
 	<li class="post pingback">
-		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyeleven' ), ' ' ); ?></p>
+		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( _x( 'Edit', 'Comment edit link', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
 	<?php
 			break;
 		default :
@@ -525,7 +525,7 @@
 						);
 					?>
 
-					<?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
+					<?php edit_comment_link( _x( 'Edit', 'Comment edit link', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 				</div><!-- .comment-author .vcard -->
 
 				<?php if ( $comment->comment_approved == '0' ) : ?>
Index: wp-content/themes/twentyeleven/rtl.css
===================================================================
--- wp-content/themes/twentyeleven/rtl.css	(revision 18306)
+++ wp-content/themes/twentyeleven/rtl.css	(working copy)
@@ -337,7 +337,8 @@
 	float: left;
 }
 #respond input#submit {
-	right: 30px;
+	left: 0px;
+	right: auto;
 	padding: 5px 22px 5px 42px;
 }
 #respond #cancel-comment-reply-link {
@@ -375,8 +376,8 @@
 }
 
 /* Simplify the showcase template when small feature */
-	section.featured-post .attachment-small-feature,
-	.one-column section.featured-post .attachment-small-feature {
+section.featured-post .attachment-small-feature,
+.one-column section.featured-post .attachment-small-feature {
 	float: right;
 }
 article.feature-image.small {
Index: wp-content/themes/twentyeleven/showcase.php
===================================================================
--- wp-content/themes/twentyeleven/showcase.php	(revision 18306)
+++ wp-content/themes/twentyeleven/showcase.php	(working copy)
@@ -191,7 +191,7 @@
 						<li class="entry-title">
 							<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
 							<span class="comments-link">
-								<?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
+								<?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%s</strong> Replies', 'twentyeleven' ) ); ?>
 							</span>
 						</li>
 
Index: wp-content/themes/twentyeleven/style.css
===================================================================
--- wp-content/themes/twentyeleven/style.css	(revision 18306)
+++ wp-content/themes/twentyeleven/style.css	(working copy)
@@ -822,20 +822,23 @@
 .page-link span {
 	margin-right: 6px;
 }
-.entry-meta .edit-link a {
+.entry-meta .edit-link a,
+.commentlist .edit-link a {
 	background: #eee;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 	color: #666;
 	float: right;
 	font-size: 12px;
+	line-height: 1.5em;
 	font-weight: 300;
 	text-decoration: none;
 	padding: 0px 8px;
 }
-.entry-meta .edit-link a:hover {
+.entry-meta .edit-link a:hover,
+.commentlist .edit-link a:hover {
 	background: #888;
-	color: #fff;
+	color: #fff !important;
 }
 .entry-content .edit-link {
 	clear: both;
@@ -1215,7 +1218,7 @@
 	margin-bottom: 0;
 }
 .indexed.format-image footer.entry-meta {
-	background: #e0e6e8;
+	background: #ddd;
 	margin-top: -7px;
 	padding: 20px 30px;
 	overflow: hidden;
@@ -1892,9 +1895,6 @@
 	padding: 1.625em;
 	position: relative;
 }
-.commentlist .children li.comment .fn {
-	display: block;
-}
 .comment-meta .fn {
 	font-style: normal;
 }
@@ -1992,6 +1992,7 @@
 	border-radius: 3px;
 	margin: 0 auto 1.625em;
 	padding: 1.625em;
+	padding-bottom: 2.5em;
 	position: relative;
 	width: 68.9%;
 }
@@ -2080,10 +2081,10 @@
 	color: #eee;
 	cursor: pointer;
 	font-size: 15px;
-	left: 30px;
-	margin: 20px 0;
 	padding: 5px 42px 5px 22px;
-	position: relative;
+	position: absolute;
+	right: 0px;
+	bottom: 0px;
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
 }
 #respond input#submit:active {