diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
index 6e81c65..500ab26 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
@@ -210,6 +210,9 @@ public class TweetTemplate extends Composite {
 			// create first attachment previewer and pass it the carousel
 			AttachmentPreviewer firstAttachmentPreviewer = new AttachmentPreviewer(firstAttachment);
 
+			// determine if the left/right arrows must be removed
+			int imagesAvailableInCarousel = 0;
+
 			// check if it is an image
 			if(firstAttachment.getMimeType().contains("image/")){
 
@@ -224,6 +227,9 @@ public class TweetTemplate extends Composite {
 				listOfEnhancedImages.add(enhancedImage);
 				firstAttachmentPreviewer.onImageClickOpenCarousel(carousel, enhancedImage);
 
+				// increment the images
+				imagesAvailableInCarousel ++;
+
 			}
 
 			// add the first attachment to the panel
@@ -249,11 +255,18 @@ public class TweetTemplate extends Composite {
 					// pass the carousel
 					attachmentPreviewer.onImageClickOpenCarousel(carousel, enhancedImage);
 
+					// increment the images
+					imagesAvailableInCarousel ++;
+
 				}
 
 				// try to build the attachment viewer
 				attachmentPreviewPanel.add(attachmentPreviewer);
 
+				// hide arrows if there are no more than 1 images
+				if(imagesAvailableInCarousel <= 1)
+					carousel.hideArrows();
+
 			}
 
 			// update the carousel's images
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index 388cf71..eb6b09e 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -124,7 +124,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	 */
 	public String getDevelopmentUser() {
 		String user = NewsConstants.TEST_USER;
-		//user = "costantino.perciante";
+		user = "costantino.perciante";
 		return user;
 	}
 	/**