Index: bp-default/_inc/css/default.css
===================================================================
--- bp-default/_inc/css/default.css	(revision 4424)
+++ bp-default/_inc/css/default.css	(working copy)
@@ -1927,14 +1927,15 @@
 }
 ol.commentlist li {
 	list-style: none;
+	 margin-bottom: 20px;
 }
 ol.commentlist div.comment-avatar-box {
 	float: left;
-	margin: 10px 10px 10px 0;
+	margin: 10px 10px 0px 0;
 }
 .commentlist ul.children div.comment-avatar-box {
 	float: left;
-	margin: 0px 10px 10px 0;
+	margin: 0px 10px 0px 0;
 }
 div.comment-avatar-box img {
 	border: 2px solid #eee;
@@ -1952,6 +1953,18 @@
 	font-size: 11px;
 	margin: 10px 0;
 }
+div.comment-options {
+	float:right;
+}
+div.comment-meta {
+  float: left;
+}
+li.depth-1 div.comment-content p {
+	clear: right;
+}
+ul.children div.comment-content p {
+	clear: both;
+}
 div.comment-meta em {
 	font-style: normal;
 }
Index: bp-default/functions.php
===================================================================
--- bp-default/functions.php	(revision 4424)
+++ bp-default/functions.php	(working copy)
@@ -439,25 +439,25 @@
 
 					<?php if ( 1 == $depth ) : ?>
 						&middot; <a href="#comment-<?php comment_ID() ?>"><?php _e( 'View', 'buddypress' ) ?></a>
+                        <?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' ); ?>
 					<?php elseif ( comments_open() ) : ?>
+                    <?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' ); ?>
 						&middot; <?php echo comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'], 'reply_text' => __( 'Reply', 'buddypress' ) ) ) ?>
 					<?php endif; ?>
 
-					<?php edit_comment_link( __( 'Edit', 'buddypress' ), '&middot; ', '' ); ?>
+					
 				</p>
 			</div>
-
+			<?php if ( 1 == $depth && comments_open() ) : ?>
+				<div class="comment-options">
+					<?php echo comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
+				</div>
+			<?php endif; ?>
 			<?php if ( $comment->comment_approved == '0' ) : ?>
 			 	<em class="moderate"><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?></em><br />
 			<?php endif; ?>
 
 			<?php comment_text() ?>
-
-			<?php if ( 1 == $depth && comments_open() ) : ?>
-				<div class="comment-options">
-					<?php echo comment_reply_link( array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
-				</div>
-			<?php endif; ?>
 		</div>
 <?php
 }