diff --git a/assets/admin.css b/assets/admin.css
index 57fc9aa7..5db55f98 100755
--- a/assets/admin.css
+++ b/assets/admin.css
@@ -394,20 +394,6 @@
 	font-weight: bold;
 }
 
-.cf-clearfix {
-	display: block;
-	zoom: 1;
-}
-
-.cf-clearfix:after {
-	content: " ";
-	display: block;
-	font-size: 0;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
 /**
  * Meta Broadcast Box
  */
diff --git a/assets/comments.css b/assets/comments.css
index c29cc77b..78d77ab8 100755
--- a/assets/comments.css
+++ b/assets/comments.css
@@ -411,7 +411,7 @@ override submit styles in TwentyEleven theme */
 	list-style-image: none;
 	list-style-position: outside;
 	list-style-type: none;
-	margin: 0;
+	margin: 10px 0 0;
 }
 
 #social .social-comment {
@@ -599,6 +599,7 @@ override submit styles in TwentyEleven theme */
 }
 
 #social .social-last-reply-when {
+    float: right;
 	font-size: 11px;
 	font-style: italic;
 	margin-bottom: 4px;
@@ -807,10 +808,6 @@ override submit styles in TwentyEleven theme */
 /**
  * Social items display (retweets, likes, etc...)
  */
-.social-items {
-    clear: both;
-}
-
 #social .social-items-icon {
     float: left;
     margin: 2px 5px;
@@ -821,9 +818,28 @@ override submit styles in TwentyEleven theme */
     margin: 2px;
 }
 
+#social .social-items.social-comment-collapse {
+	filter: alpha(opacity = 30);
+	opacity: .3;
+}
+
 #social .social-items-and-more {
     float: left;
     margin: 8px 0 0 5px;
-    font-size: 11px;
+    font-size: 12px;
     color: #666;
+}
+
+.cf-clearfix {
+	display: block;
+	zoom: 1;
+}
+
+.cf-clearfix:after {
+	content: " ";
+	display: block;
+	font-size: 0;
+	height: 0;
+	clear: both;
+	visibility: hidden;
 }
\ No newline at end of file
diff --git a/assets/social.js b/assets/social.js
index 3e64db85..b2c4a044 100755
--- a/assets/social.js
+++ b/assets/social.js
@@ -77,8 +77,6 @@
 
 				var className = $(this).attr('rel');
 				if (className == 'social-all') {
-                    $('.social-items').show();
-
 					if (nextLink !== null) {
 						$nextLink.attr('href', nextLink);
 					}
@@ -87,13 +85,9 @@
 						$prevLink.attr('href', prevLink);
 					}
 
-					$('.social-commentlist li').removeClass('social-comment-collapse');
+					$('.social-commentlist li, .social-items').removeClass('social-comment-collapse');
 				} else {
-                    $('.social-items').hide();
-                    if ($('.social-items.'+className).length) {
-                        $('.social-items.'+className).show();
-                    }
-
+                    $('.social-items:not(.'+className+')').addClass('social-comment-collapse');
 					$('.social-commentlist li').each(function() {
 						if (!$(this).hasClass(className)) {
 							$(this).addClass('social-comment-collapse');
diff --git a/social-facebook.php b/social-facebook.php
index 0b13038c..ceb18185 100755
--- a/social-facebook.php
+++ b/social-facebook.php
@@ -97,6 +97,19 @@ public static function get_avatar($avatar, $comment, $size, $default, $alt) {
 		return $avatar;
 	}
 
+    /**
+     * Pre-processor to the comments.
+     *
+     * @wp-filter social_comments_array
+     * @static
+     * @param  array  $comments
+     * @param  int    $post_id
+     * @return array
+     */
+    public static function comments_array(array $comments, $post_id) {
+
+    }
+
 } // End Social_Facebook
 
 define('SOCIAL_FACEBOOK_FILE', __FILE__);
@@ -107,5 +120,6 @@ public static function get_avatar($avatar, $comment, $size, $default, $alt) {
 add_filter('social_comment_type_to_service', array('Social_Facebook', 'comment_type_to_service'));
 add_filter('get_avatar', array('Social_Facebook', 'get_avatar'), 10, 5);
 add_filter('get_avatar_comment_types', array('Social_Facebook', 'get_avatar_comment_types'));
+add_filter('social_comments_array', array('Social_Twitter', 'comments_array'), 10, 2);
 
 }
\ No newline at end of file
diff --git a/social-twitter.php b/social-twitter.php
index 9ab8de75..3ba51030 100755
--- a/social-twitter.php
+++ b/social-twitter.php
@@ -34,9 +34,9 @@ public static function get_avatar_comment_types(array $types) {
 	}
 
 	/**
-	 * Pre-processor to the comments to match up in_reply_to_status_ids.
+	 * Pre-processor to the comments.
 	 *
-	 * @wp-filter comments_array
+	 * @wp-filter social_comments_array
 	 * @static
 	 * @param  array  $comments
 	 * @param  int    $post_id
diff --git a/views/comments.php b/views/comments.php
index bde9b578..685ff09f 100755
--- a/views/comments.php
+++ b/views/comments.php
@@ -106,6 +106,7 @@
 								));
 							}
 						}
+                        echo '<div class="cf-clearfix"></div>';
 					}
 				?>
 				<ol class="social-commentlist">