diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddCommentEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddCommentEvent.java
index 555bc5d..8798d25 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddCommentEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddCommentEvent.java
@@ -2,7 +2,7 @@ package org.gcube.portlets.user.newsfeed.client.event;
 
 import java.util.ArrayList;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddLikeEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddLikeEvent.java
index 81460f8..098d5e0 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddLikeEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/AddLikeEvent.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteCommentEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteCommentEvent.java
index b295b77..829ef91 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteCommentEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteCommentEvent.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteFeedEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteFeedEvent.java
index 117a15b..850d731 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteFeedEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/DeleteFeedEvent.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/EditCommentEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/EditCommentEvent.java
index bd7ee86..be1322d 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/EditCommentEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/EditCommentEvent.java
@@ -1,7 +1,7 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
 import org.gcube.portal.databook.shared.Comment;
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/OpenFeedEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/OpenFeedEvent.java
index 3658c4e..8b13d7d 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/OpenFeedEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/OpenFeedEvent.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/SeeCommentsEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/SeeCommentsEvent.java
index b239987..2539aaf 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/SeeCommentsEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/SeeCommentsEvent.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/UnLikeEvent.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/UnLikeEvent.java
index 28f8c78..671be6f 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/event/UnLikeEvent.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/event/UnLikeEvent.java
@@ -1,6 +1,6 @@
 package org.gcube.portlets.user.newsfeed.client.event;
 
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 
 import com.google.gwt.event.shared.GwtEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
index 90a7471..e97cbc3 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
@@ -37,11 +37,11 @@ import org.gcube.portlets.user.newsfeed.client.event.ShowNewUpdatesEvent;
 import org.gcube.portlets.user.newsfeed.client.event.ShowNewUpdatesEventHandler;
 import org.gcube.portlets.user.newsfeed.client.event.UnLikeEvent;
 import org.gcube.portlets.user.newsfeed.client.event.UnLikeEventHandler;
-import org.gcube.portlets.user.newsfeed.client.templates.FilterPanel;
-import org.gcube.portlets.user.newsfeed.client.templates.NewFeedsAvailable;
-import org.gcube.portlets.user.newsfeed.client.templates.ShowMoreFeeds;
-import org.gcube.portlets.user.newsfeed.client.templates.SingleComment;
-import org.gcube.portlets.user.newsfeed.client.templates.TweetTemplate;
+import org.gcube.portlets.user.newsfeed.client.ui.FilterPanel;
+import org.gcube.portlets.user.newsfeed.client.ui.NewFeedsAvailable;
+import org.gcube.portlets.user.newsfeed.client.ui.ShowMoreFeeds;
+import org.gcube.portlets.user.newsfeed.client.ui.SingleComment;
+import org.gcube.portlets.user.newsfeed.client.ui.TweetTemplate;
 import org.gcube.portlets.user.newsfeed.shared.EnhancedFeed;
 import org.gcube.portlets.user.newsfeed.shared.MoreFeedsBean;
 import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/AddCommentTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java
similarity index 98%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/AddCommentTemplate.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java
index 3ce5875..03fc5b0 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/AddCommentTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import org.gcube.portal.databook.shared.Comment;
 import org.gcube.portal.databook.shared.UserInfo;
@@ -97,6 +97,7 @@ public class AddCommentTemplate extends Composite {
 	}
 	public void setFocus() {
 		commentTextArea.setFocus(true);
+		submitButton.setVisible(true);
 		//it needs a timer otherwise it won't work
 		Timer t = new Timer() {
 			@Override
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/AddCommentTemplate.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml
similarity index 93%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/AddCommentTemplate.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml
index b10bd39..680214c 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/AddCommentTemplate.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/AddCommentTemplate.ui.xml
@@ -2,7 +2,7 @@
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui"
 	xmlns:w="urn:import:org.gcube.portlets.user.gcubewidgets.client.elements"
-	xmlns:m="urn:import:org.gcube.portlets.user.newsfeed.client.templates">
+	xmlns:m="urn:import:org.gcube.portlets.user.newsfeed.client.ui">
 	<ui:style>
 		.important {
 			font-weight: bold;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/FilterPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java
similarity index 98%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/FilterPanel.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java
index 9975214..d91a5c2 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/FilterPanel.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import org.gcube.portlets.user.newsfeed.client.FilterType;
 import org.gcube.portlets.user.newsfeed.client.NewsServiceAsync;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/FilterPanel.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.ui.xml
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/FilterPanel.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/FilterPanel.ui.xml
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/LinkPreviewer.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/LinkPreviewer.java
similarity index 95%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/LinkPreviewer.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/LinkPreviewer.java
index d8b3272..66c00e9 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/LinkPreviewer.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/LinkPreviewer.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/LinkPreviewer.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/LinkPreviewer.ui.xml
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/LinkPreviewer.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/LinkPreviewer.ui.xml
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/NewFeedsAvailable.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/NewFeedsAvailable.java
similarity index 97%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/NewFeedsAvailable.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/NewFeedsAvailable.java
index a12fa95..493112a 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/NewFeedsAvailable.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/NewFeedsAvailable.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import org.gcube.portlets.user.newsfeed.client.event.ShowNewUpdatesEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/NewFeedsAvailable.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/NewFeedsAvailable.ui.xml
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/NewFeedsAvailable.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/NewFeedsAvailable.ui.xml
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/ShowMoreFeeds.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ShowMoreFeeds.java
similarity index 96%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/ShowMoreFeeds.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ShowMoreFeeds.java
index 524c6dd..59b5627 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/ShowMoreFeeds.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ShowMoreFeeds.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import org.gcube.portlets.user.newsfeed.client.event.ShowMoreUpdatesEvent;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/ShowMoreFeeds.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ShowMoreFeeds.ui.xml
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/ShowMoreFeeds.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/ShowMoreFeeds.ui.xml
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java
similarity index 98%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java
index 763dfb1..ac9cf00 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.java
@@ -1,4 +1,4 @@
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import org.gcube.portal.databook.client.GCubeSocialNetworking;
 import org.gcube.portal.databook.client.util.Encoder;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.ui.xml
similarity index 100%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SingleComment.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SingleComment.ui.xml
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SuperPosedTextArea.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java
similarity index 99%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SuperPosedTextArea.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java
index 921b3ba..0a39081 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/SuperPosedTextArea.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/SuperPosedTextArea.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
similarity index 99%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
index c6cd440..eb7b95a 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.gcube.portlets.user.newsfeed.client.templates;
+package org.gcube.portlets.user.newsfeed.client.ui;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.ui.xml b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml
similarity index 97%
rename from src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.ui.xml
rename to src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml
index cdad1d9..94ed5db 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/templates/TweetTemplate.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/ui/TweetTemplate.ui.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
-	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:m="org.gcube.portlets.user.newsfeed.client.templates">
+	xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:m="org.gcube.portlets.user.newsfeed.client.ui">
 	<g:HTMLPanel ui:field="mainHTML">
 		<div class="div-table">
 			<div class="div-table-row">
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 7eb83b4..dfb4b04 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
@@ -116,7 +116,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	 */
 	public String getDevelopmentUser() {
 		String user = "test.user";
-		//user = "massimiliano.assante";
+		user = "massimiliano.assante";
 		return user;
 	}
 	/**