diff --git a/.classpath b/.classpath
index a40fe77..2b3b74c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/resource-management-5.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/resource-management-5.0.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -36,5 +36,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/resource-management-5.0.2-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/resource-management-5.0.3-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 3585b9d..4e00d15 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.2-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.3-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index 871557e..160b273 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>resource-management</artifactId>
-	<version>5.0.2-SNAPSHOT</version>
+	<version>5.0.3-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>gCube Resource Management Portlet</name>
 	<description>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>xalan</groupId>
 			<artifactId>xalan</artifactId>
-<!-- 			<version>2.7.1</version> -->
+			<!-- <version>2.7.1</version> -->
 		</dependency>
 		<dependency>
 			<groupId>com.sencha.gxt</groupId>
@@ -166,17 +166,22 @@
 			<artifactId>resource-sweeper-widget</artifactId>
 			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.gcube.portlets.admin</groupId> -->
-		<!-- <artifactId>software-upload-wizard</artifactId> -->
-		<!-- <version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.gcube.portlets.admin</groupId>
+			<artifactId>software-upload-wizard</artifactId>
+			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.admin</groupId>
 			<artifactId>activation-record-widgets</artifactId>
 			<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
-		<!-- guice -->
+		<!-- guice guava-->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ResourceDetailsPanel.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ResourceDetailsPanel.java
index 5803001..c9233ad 100644
--- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ResourceDetailsPanel.java
+++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ResourceDetailsPanel.java
@@ -25,6 +25,7 @@ import org.gcube.portlets.admin.resourcemanagement.client.utils.OpCommands;
 import org.gcube.portlets.admin.resourcemanagement.client.widgets.console.ConsoleMessageBroker;
 import org.gcube.portlets.admin.resourcemanagement.client.widgets.registry.UIIdentifiers;
 import org.gcube.portlets.admin.resourcemanagement.client.widgets.registry.WidgetsRegistry;
+import org.gcube.portlets.admin.software_upload_wizard.client.AppController;
 //import org.gcube.portlets.admin.software_upload_wizard.client.AppController;
 import org.gcube.resourcemanagement.support.client.utils.StatusHandler;
 import org.gcube.resourcemanagement.support.client.views.ResourceTypeDecorator;
@@ -323,24 +324,22 @@ public class ResourceDetailsPanel {
 			this.getToolBar().add(new SeparatorToolItem());
 			ToolButton doAddSoftware = new ToolButton("add-software-icon") {
 				protected void onClick(final ComponentEvent be) {
-//					super.onClick(be);
-//
-//
-//					GWT.runAsync(AppController.class, new RunAsyncCallback() {
-//						@Override
-//						public void onSuccess() {
-//							String currentScope = StatusHandler.getStatus().getCurrentScope();
-//							HandlerManager eventBus = new HandlerManager(null);
-//							AppController appViewer = new AppController(eventBus, currentScope);
-//							//AppController appViewer = new AppController(eventBus);
-//							appViewer.go();
-//						}
-//
-//						public void onFailure(Throwable reason) {
-//							Window.alert("There are networks problem, please check your connection.");              
-//						}
-//
-//					});
+					super.onClick(be);
+					GWT.runAsync(AppController.class, new RunAsyncCallback() {
+						@Override
+						public void onSuccess() {
+							String currentScope = StatusHandler.getStatus().getCurrentScope();
+							HandlerManager eventBus = new HandlerManager(null);
+							AppController appViewer = new AppController(eventBus, currentScope);
+							//AppController appViewer = new AppController(eventBus);
+							appViewer.go();
+						}
+
+						public void onFailure(Throwable reason) {
+							Window.alert("There are networks problem, please check your connection.");              
+						}
+
+					});
 
 				};
 			};
diff --git a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
index d98b914..ad60f9f 100644
--- a/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
@@ -8,7 +8,7 @@
 	<inherits name='com.extjs.gxt.ui.GXT' />
 <inherits name='com.google.gwt.query.Query' />
 	<!-- inherits Software Uplad Widget -->
-<!-- 	<inherits name='org.gcube.portlets.admin.software_upload_wizard.SoftwareUploadWizard' /> -->
+	<inherits name='org.gcube.portlets.admin.software_upload_wizard.SoftwareUploadWizard' />
 	<!-- inherits Resource Sweeper Widget -->
 	<inherits name='org.gcube.portlets.admin.resourcesweeper.Resource_sweeper' />
 
diff --git a/src/main/webapp/ResourceManagementPortlet.css b/src/main/webapp/ResourceManagementPortlet.css
index 1c56496..b94faf9 100644
--- a/src/main/webapp/ResourceManagementPortlet.css
+++ b/src/main/webapp/ResourceManagementPortlet.css
@@ -1,6 +1,6 @@
 /*  Comment import to style regular, uncomment if deploying on openbio or d4science.org */
 /*@import url(openbio.css);*/
-@import url(d4scienceOrg.css);
+@import url(coherence.css);
 
 /* Fix the scrollbar background style*/
 .x-progress-text div {
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c8273ef..8eb050a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -28,17 +28,17 @@
 
 
 	<!-- SUW -->
-<!-- 	<filter> -->
-<!-- 		<filter-name>guiceFilter</filter-name> -->
-<!-- 		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class> -->
-<!-- 	</filter> -->
-<!-- 	<filter-mapping> -->
-<!-- 		<filter-name>guiceFilter</filter-name> -->
-<!-- 		<url-pattern>/*</url-pattern> -->
-<!-- 	</filter-mapping> -->
-<!-- 	<listener> -->
-<!-- 		<listener-class>org.gcube.portlets.admin.software_upload_wizard.server.BootstrapListener</listener-class> -->
-<!-- 	</listener> -->
+	<filter>
+		<filter-name>guiceFilter</filter-name>
+		<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>guiceFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	<listener>
+		<listener-class>org.gcube.portlets.admin.software_upload_wizard.server.BootstrapListener</listener-class>
+	</listener>
 
 	<!-- IS Health -->
 	<servlet>
diff --git a/src/main/webapp/d4scienceOrg.css b/src/main/webapp/coherence.css
similarity index 100%
rename from src/main/webapp/d4scienceOrg.css
rename to src/main/webapp/coherence.css