diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index fb8c6e4..1fe3469 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -40,6 +40,9 @@
         <dependent-module archiveName="tabular-data-table-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-table-widget/tabular-data-table-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-information-widget-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information-widget/tabular-data-information-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="tabular-data-column-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/pom.xml b/pom.xml
index 0d68a36..152514d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,17 @@
 					<version>1.0.1</version>
 					<scope>runtime</scope>
 				</dependency>
+				<!-- Storage for CSV temp -->
+				<dependency>
+					<groupId>org.gcube.contentmanagement</groupId>
+					<artifactId>storage-manager-core</artifactId>
+					<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+				</dependency>
+				<dependency>
+					<groupId>org.gcube.contentmanagement</groupId>
+					<artifactId>storage-manager-wrapper</artifactId>
+					<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
@@ -132,6 +143,7 @@
 			<artifactId>gcube-widgets</artifactId>
 		</dependency>
 
+
 		<!-- WSLT dependencies -->
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
@@ -142,7 +154,7 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
 			<scope>provided</scope>
 		</dependency>
 
@@ -189,7 +201,7 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>csv4j</artifactId>
-			<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
+			<!-- <version>[1.2.0-SNAPSHOT, 2.0.0-common)</version> -->
 		</dependency>
 
 		<!-- Session Checker -->
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 656d42e..41322b3 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -22,6 +22,7 @@ import org.gcube.portlets.user.td.sharewidget.client.TRShare;
 import org.gcube.portlets.user.td.tablewidget.client.CloneTabularResource;
 import org.gcube.portlets.user.td.tablewidget.client.history.HistoryDiscard;
 import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows;
+import org.gcube.portlets.user.td.tablewidget.client.rows.EditRowDialog;
 import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
 import org.gcube.portlets.user.td.taskswidget.client.TdTaskController;
 import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
@@ -955,8 +956,18 @@ public class TabularDataController {
 		}
 	}
 
+	private void onRowsEdit(ArrayList<String> rows) {
+		if (rows == null || rows.size() == 0) {
+			UtilsGXT3.alert("No rows selected", "No rows selected");
+		} else {
+			EditRowDialog editRowDialog = new EditRowDialog(trId, rows, eventBus);
+			 editRowDialog.show();
+		}
+	}
+
+	
 	private void onRowsAdd(ArrayList<String> rows) {
-		tabularData.addRow(rows);
+		//tabularData.addRow(rows);
 	}
 
 	protected void doGridContextMenuCommand(GridContextMenuItemEvent event) {
@@ -971,6 +982,7 @@ public class TabularDataController {
 			onRowsAdd(rows);
 			break;
 		case ROWEDIT:
+			onRowsEdit(rows);
 			break;
 		case ROWDELETE:
 			onRowsDelete(rows);
diff --git a/src/main/java/org/gcube/portlets/user/td/client/grid/GridContextMenu.java b/src/main/java/org/gcube/portlets/user/td/client/grid/GridContextMenu.java
index b60f2eb..878f52c 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/grid/GridContextMenu.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/grid/GridContextMenu.java
@@ -51,24 +51,27 @@ public class GridContextMenu {
 		 * 
 		 * } }); tableContextMenu.add(addRowItem);
 		 */
-
 		/*
-		 * MenuItem editRowItem = new MenuItem("Edit Row");
-		 * editRowItem.setId(GridOperationId.ROWEDIT.toString());
-		 * editRowItem.setIcon(TabularDataResources.INSTANCE.rowEdit());
-		 * editRowItem.addSelectionHandler(new SelectionHandler<Item>() {
-		 * 
-		 * @Override public void onSelection(SelectionEvent<Item> event) {
-		 * Log.debug("gridPanel is: " + gridPanel); if (gridPanel != null) {
-		 * 
-		 * ArrayList<String> rows=gridPanel.getSelectedRowsId();
-		 * GridContextMenuItemEvent eventGridContextMenu = new
-		 * GridContextMenuItemEvent( GridOperationId.ROWEDIT, rows);
-		 * eventBus.fireEvent(eventGridContextMenu);
-		 * 
-		 * } } }); tableContextMenu.add(editRowItem);
-		 */
+		MenuItem editRowItem = new MenuItem("Edit Row");
+		editRowItem.setId(GridOperationId.ROWEDIT.toString());
+		editRowItem.setIcon(TabularDataResources.INSTANCE.rowEdit());
+		editRowItem.addSelectionHandler(new SelectionHandler<Item>() {
 
+			@Override
+			public void onSelection(SelectionEvent<Item> event) {
+				Log.debug("gridPanel is: " + gridPanel);
+				if (gridPanel != null) {
+
+					ArrayList<String> rows = gridPanel.getSelectedRowsId();
+					GridContextMenuItemEvent eventGridContextMenu = new GridContextMenuItemEvent(
+							GridOperationId.ROWEDIT, rows);
+					eventBus.fireEvent(eventGridContextMenu);
+
+				}
+			}
+		});
+		tableContextMenu.add(editRowItem);
+		 */
 		MenuItem deleteRowItem = new MenuItem("Delete Row");
 		deleteRowItem.setId(GridOperationId.ROWDELETE.toString());
 		deleteRowItem.setIcon(TabularDataResources.INSTANCE.rowRemove());
diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index db5a423..605d4ed 100644
--- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -45,17 +45,17 @@
 
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
-    <!--   
+    <!--  
     <set-property name="log_DivLogger" value="ENABLED" /> <set-property 
 		name="log_ConsoleLogger" value="ENABLED" /> <set-property name="log_FirebugLogger" 
 		value="ENABLED" /> <set-property name="log_GWTLogger" value="ENABLED" /> 
-		<set-property name="log_SystemLogger" value="ENABLED" />  -->
-  	
+		<set-property name="log_SystemLogger" value="ENABLED" /> -->
+	   	
     <set-property name="log_DivLogger" value="DISABLED" />
 	<set-property name="log_ConsoleLogger" value="DISABLED" />
 	<set-property name="log_FirebugLogger" value="DISABLED" />
 	<set-property name="log_GWTLogger" value="DISABLED" />
-	<set-property name="log_SystemLogger" value="DISABLED" />
+	<set-property name="log_SystemLogger" value="DISABLED" /> 
 	<!-- Specify the paths for translatable code -->
 	<source path='client' />
 	<source path='shared' />