diff --git a/deployHawkBitSandbox.sh b/deployHawkBitSandbox.sh
index d774f4205..ac724e5da 100644
--- a/deployHawkBitSandbox.sh
+++ b/deployHawkBitSandbox.sh
@@ -11,10 +11,11 @@
 # data example to a cloud foundry enviroment. Expects existing CF CLI
 # installation and login to be existing already.
 
+cf stop hawkbit-simulator
 cd examples/hawkbit-example-app/target/
 cf push
 cd ../..
-java -jar hawkbit-mgmt-api-client/target/hawkbit-mgmt-api-client-0.2.0-SNAPSHOT.jar --hawkbit.url=hawkbit.eu-gb.mybluemix.net
+java -jar hawkbit-example-mgmt-simulator/target/hawkbit-example-mgmt-simulator-0.2.0-SNAPSHOT.jar --hawkbit.url=https://hawkbit.eu-gb.mybluemix.net
 cd hawkbit-device-simulator/target/
 cf push
 cd ../../..
diff --git a/examples/hawkbit-device-simulator/cf/manifest.yml b/examples/hawkbit-device-simulator/cf/manifest.yml
index 188ef7780..efc18ab45 100644
--- a/examples/hawkbit-device-simulator/cf/manifest.yml
+++ b/examples/hawkbit-device-simulator/cf/manifest.yml
@@ -13,7 +13,7 @@ applications:
   memory: 1024M
   instances: 1
   buildpack: https://github.com/cloudfoundry/java-buildpack
-  path: ${project.build.finalName}.jar
+  path: @project.build.finalName@.jar
   services:
     - dmf-rabbit
   env:
diff --git a/examples/hawkbit-example-app/cf/manifest-simple.yml b/examples/hawkbit-example-app/cf/manifest-simple.yml
index c87a533f4..e367742aa 100644
--- a/examples/hawkbit-example-app/cf/manifest-simple.yml
+++ b/examples/hawkbit-example-app/cf/manifest-simple.yml
@@ -13,7 +13,7 @@ applications:
   memory: 1024M
   instances: 1
   buildpack: https://github.com/cloudfoundry/java-buildpack
-  path: ${project.build.finalName}.jar
+  path: @project.build.finalName@.jar
   env:
     SPRING_PROFILES_ACTIVE: cloudsandbox
     CF_STAGING_TIMEOUT: 15
diff --git a/examples/hawkbit-example-app/cf/manifest.yml b/examples/hawkbit-example-app/cf/manifest.yml
index 2145f467d..a1401afbc 100644
--- a/examples/hawkbit-example-app/cf/manifest.yml
+++ b/examples/hawkbit-example-app/cf/manifest.yml
@@ -13,7 +13,7 @@ applications:
   memory: 1024M
   instances: 1
   buildpack: https://github.com/cloudfoundry/java-buildpack
-  path: ${project.build.finalName}.jar
+  path: @project.build.finalName@.jar
   services:
     - dmf-rabbit
   env:
diff --git a/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/RedirectController.java b/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/RedirectController.java
new file mode 100644
index 000000000..e4cb0d820
--- /dev/null
+++ b/examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/RedirectController.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.app;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * Redirects for convenience of the example apps users. hawkBit's management UI
+ * is by default not listening on / but on /UI.
+ *
+ */
+@Controller
+public class RedirectController {
+
+    /**
+     * @return redirect to the Management UI
+     */
+    @RequestMapping("/")
+    public ModelAndView home() {
+        return new ModelAndView("redirect:/UI/");
+    }
+}
diff --git a/examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties b/examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties
index 85c47cb8f..85dfb02ee 100644
--- a/examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties
+++ b/examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties
@@ -7,6 +7,11 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
+security.require-ssl=true
+server.tomcat.protocol-header=X-Forwarded-Proto
+# IBM Adresses unpredictable
+server.tomcat.internal-proxies=.*
+
 vaadin.servlet.productionMode=true
 
 ## Configuration for building download URLs - START
diff --git a/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties b/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
index c42dbb111..881df6e81 100644
--- a/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
+++ b/examples/hawkbit-example-mgmt-simulator/src/main/resources/application.properties
@@ -21,4 +21,5 @@ hawkbit.scenarios.[0].ds-name=gettingstarted-example
 hawkbit.scenarios.[0].distribution-sets=3
 hawkbit.scenarios.[0].sm-fw-name=gettingstarted-example
 hawkbit.scenarios.[0].sm-sw-name=gettingstarted-example
-hawkbit.scenarios.[0].runRollouts=false
\ No newline at end of file
+hawkbit.scenarios.[0].runRollouts=false
+hawkbit.scenarios.[0].artifactsPerSM=0
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
index ecacdcd67..090a3af8a 100644
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
@@ -86,7 +86,7 @@
     }
     .view-header:after {
       background: $logo-image no-repeat right top;
-      background-position: right 0 top 8px;
+      background-position: $logo-position;
       content: "";
       height: 80px;
       position: absolute;
@@ -143,15 +143,15 @@
   .valo-menu-title {
     line-height: 1.2;
   }
-  
+
   .v-menubar-user-menu:after {
     display: none;
   }
-  
+
   .v-menubar-menuitem-user-menuitem {
     width: 100%;
   }
-  
+
   .v-menubar-user-menu > .v-menubar-menuitem {
     white-space: normal !important;
     .v-icon {
@@ -282,15 +282,15 @@
   .links {
     padding-left: 22px;
   }
-  
+
    .font-icon{
 	font-family:FontAwesome;
 	font-style:normal;
 	font-weight:normal;
   }
-  
+
   .form-lastrow {
 	padding-bottom: 12px !important;
   }
-  
+
 }
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss
index 96e6d9132..477134281 100644
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss
@@ -10,6 +10,12 @@
 $hawkbit-primary-color: #551f62;
 $hawkbit-primary-color-light: #551f62;
 
+//Logo image for the top right corner
+$logo-image: url('images/hawkbit_logo.png');
+
+//Logo image postion
+$logo-position: right 8px top 8px;
+
 //Application text font size.All widget text style are computed based on this
 $app-text-font-size: 16px;
 
@@ -76,7 +82,7 @@ $accordion-action-history-title-color: #551f62;
 //Success icon color on valid target filter query
 $success-icon-color: #ff0000;
 
-//Error icon color on invalid target filter query 
+//Error icon color on invalid target filter query
 $error-icon-color: #008000;
 
 
@@ -133,8 +139,8 @@ $twin-table-border-grey:#888;
 
 
 $progress-bar-scheduled-part: $blue-color;
-$progress-bar-running-part: $signal-yellow-color; 
+$progress-bar-running-part: $signal-yellow-color;
 $progress-bar-error-part: $signal-red-color;
 $progress-bar-finished-part: $signal-green-color;
 $progress-bar-cancelled-part: $grey-light;
-$progress-bar-notstarted-part: $grey-color;
\ No newline at end of file
+$progress-bar-notstarted-part: $grey-color;
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/images/hawkbit_logo.png b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/images/hawkbit_logo.png
new file mode 100644
index 000000000..21af5c30a
Binary files /dev/null and b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/images/hawkbit_logo.png differ