diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 684b9fc..fb8c6e4 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -28,6 +28,9 @@
         <dependent-module archiveName="tabular-data-sdmx-import-widget-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-import-widget/tabular-data-sdmx-import-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-open-widget-2.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-open-widget/tabular-data-open-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="tabular-data-csv-export-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-export-widget/tabular-data-csv-export-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
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 845d1b8..b60f2eb 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
@@ -35,48 +35,40 @@ public class GridContextMenu {
 		tableContextMenu = new Menu();
 
 		/*
-		MenuItem addRowItem = new MenuItem("Add Row");
-		addRowItem.setId(GridOperationId.ROWADD.toString());
-		addRowItem.setIcon(TabularDataResources.INSTANCE.rowInsert());
-		addRowItem.addSelectionHandler(new SelectionHandler<Item>() {
+		 * MenuItem addRowItem = new MenuItem("Add Row");
+		 * addRowItem.setId(GridOperationId.ROWADD.toString());
+		 * addRowItem.setIcon(TabularDataResources.INSTANCE.rowInsert());
+		 * addRowItem.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.ROWADD, rows);
+		 * eventBus.fireEvent(eventGridContextMenu);
+		 * 
+		 * }
+		 * 
+		 * } }); tableContextMenu.add(addRowItem);
+		 */
 
-			@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.ROWADD, rows);
-					eventBus.fireEvent(eventGridContextMenu);
+		/*
+		 * 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);
+		 */
 
-				}
-
-			}
-		});
-		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) {
-					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());
@@ -86,19 +78,16 @@ public class GridContextMenu {
 			public void onSelection(SelectionEvent<Item> event) {
 				Log.debug("gridPanel is: " + gridPanel);
 				if (gridPanel != null) {
-					if (gridPanel != null) {
-						ArrayList<String> rows=gridPanel.getSelectedRowsId();
-						GridContextMenuItemEvent eventGridContextMenu = new GridContextMenuItemEvent(
-									GridOperationId.ROWDELETE, rows);
-						eventBus.fireEvent(eventGridContextMenu);
-					}
-
+					ArrayList<String> rows = gridPanel.getSelectedRowsId();
+					GridContextMenuItemEvent eventGridContextMenu = new GridContextMenuItemEvent(
+							GridOperationId.ROWDELETE, rows);
+					eventBus.fireEvent(eventGridContextMenu);
 				}
 
 			}
 		});
 		tableContextMenu.add(deleteRowItem);
-		
+
 		MenuItem replaceRowsItem = new MenuItem("Replace Value");
 		replaceRowsItem.setId(GridOperationId.REPLACE.toString());
 		replaceRowsItem.setIcon(TabularDataResources.INSTANCE.columnReplace());
@@ -108,23 +97,19 @@ public class GridContextMenu {
 			public void onSelection(SelectionEvent<Item> event) {
 				Log.debug("gridPanel is: " + gridPanel);
 				if (gridPanel != null) {
-					if (gridPanel != null) {
-						CellData cellData=gridPanel.getSelectedCell();
-						if(cellData!=null){
-							GridContextMenuItemEvent eventGridContextMenu = new GridContextMenuItemEvent(
-									GridOperationId.REPLACE, cellData);
-							eventBus.fireEvent(eventGridContextMenu);
-						} else {
-							
-						}
-					}
+					CellData cellData = gridPanel.getSelectedCell();
+					if (cellData != null) {
+						GridContextMenuItemEvent eventGridContextMenu = new GridContextMenuItemEvent(
+								GridOperationId.REPLACE, cellData);
+						eventBus.fireEvent(eventGridContextMenu);
+					} else {
 
+					}
 				}
 
 			}
 		});
 		tableContextMenu.add(replaceRowsItem);
-		
 
 	}