Index: loop-bbp_replies.php
===================================================================
--- loop-bbp_replies.php	(revision 2709)
+++ loop-bbp_replies.php	(working copy)
@@ -13,18 +13,23 @@
 
 	<?php get_template_part( 'pagination', 'bbp_replies' ); ?>
 
-	<table class="bbp-replies" id="topic-<?php bbp_topic_id(); ?>">
+	<table class="bbp-replies" id="reply-<?php bbp_reply_id(); ?>">
 		<thead>
 			<tr>
-				<th class="bbp-reply-author"><?php _e( 'Author', 'bbpress' ); ?></th>
+				<th class="bbp-reply-author"><?php  _e( 'Author',  'bbpress' ); ?></th>
 				<th class="bbp-reply-content"><?php _e( 'Replies', 'bbpress' ); ?></th>
 			</tr>
 		</thead>
 
 		<tfoot>
+
+			<?php if ( bbp_is_topic() ) : ?>
+
 			<tr>
 				<td colspan="2"><?php bbp_topic_admin_links(); ?></td>
 			</tr>
+
+			<?php endif; ?>
 		</tfoot>
 
 		<tbody>
@@ -73,7 +78,7 @@
 
 					</td>
 
-				</tr><!-- #topic-<?php bbp_topic_id(); ?> -->
+				</tr><!-- #reply-<?php bbp_reply_id(); ?> -->
 
 			<?php endwhile; ?>
 
Index: single-bbp_reply.php
===================================================================
--- single-bbp_reply.php	(revision 2709)
+++ single-bbp_reply.php	(working copy)
@@ -12,8 +12,14 @@
 		<div id="container">
 			<div id="content" role="main">
 
-				<?php get_template_part( 'loop', 'bbp_replies' ); ?>
+					<div id="bbp-reply-wrapper-<?php bbp_reply_id(); ?>" class="bbp-reply-wrapper">
+						<div class="entry-content">
 
+							<?php get_template_part( 'loop', 'bbp_replies' ); ?>
+
+						</div>
+					</div><!-- #bbp-reply-wrapper-<?php bbp_reply_id(); ?> -->
+
 			</div><!-- #content -->
 		</div><!-- #container -->