diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml
index 256fa30..81038b5 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml
@@ -6,8 +6,9 @@
 			<div class="div-table-row">
 				<div class="div-table-col photo">
 					<g:Image title="" styleName="member-photo" url=""
-						ui:field="avatarImage" width="60" height="60"/>
-					<m:AvatarReplacement visible="false" ui:field="avatarReplacement"></m:AvatarReplacement>
+						ui:field="avatarImage" width="60" height="60" />
+					<m:AvatarReplacement visible="false"
+						ui:field="avatarReplacement"></m:AvatarReplacement>
 				</div>
 
 				<div class="div-table-col content">
@@ -46,13 +47,15 @@
 										<g:HTML ui:field="likesNo"></g:HTML>
 									</td>
 									<td align="right" style="width: 100%; vertical-align: top;">
-										<g:HTML styleName="comment" ui:field="vreSource" ></g:HTML>
+										<g:HTML styleName="comment" ui:field="vreSource"></g:HTML>
 									</td>
 								</tr>
 							</tbody>
 						</table>
 					</div>
-					<g:VerticalPanel ui:field="commentsPanel"></g:VerticalPanel>
+					<div class="tweet-content">
+						<g:VerticalPanel ui:field="commentsPanel"></g:VerticalPanel>
+					</div>
 				</div>
 				<div class="div-table-col nf-post-remove">
 					<g:HTML height="15px" ui:field="closeImage"></g:HTML>
diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css
index 373d509..0e6d619 100644
--- a/src/main/webapp/NewsFeed.css
+++ b/src/main/webapp/NewsFeed.css
@@ -221,7 +221,7 @@ div#comment-inputContainer textarea.post-comment.comment-dark-color {
 	background-image: none;
 	border: 1px solid #DDD;
 	border-radius: 4px;
-	width: 95%;
+	width: 97%;
 	margin-top: 5px;
 	margin-left: 5px;
 }
@@ -271,7 +271,7 @@ img.member-photo {
 }
 
 .commentsPanel {
-	width: 430px;
+	width: 99%;
 	margin: 4px 0 0 4px;
 }
 
@@ -583,7 +583,7 @@ a.person-link {
 }
 
 
-@media screen and (max-width: 1024px) {
+@media screen and (max-width: 1128px) {
 	.commentsPanel {
 		width: 300px;
 	}