diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index 6a637bf4d8..1aeaae830f 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -980,6 +980,7 @@ DS_MAD_CONF = [
 
 MARKET_MAD_CONF = [
     NAME = "one",
+    SUNSTONE_NAME  = "OpenNebula.org Marketplace",
     REQUIRED_ATTRS = "",
     APP_ACTIONS = "monitor",
     PUBLIC = "yes"
@@ -987,12 +988,14 @@ MARKET_MAD_CONF = [
 
 MARKET_MAD_CONF = [
     NAME = "http",
+    SUNSTONE_NAME  = "HTTP server",
     REQUIRED_ATTRS = "BASE_URL,PUBLIC_DIR",
     APP_ACTIONS = "create, delete, monitor"
 ]
 
 MARKET_MAD_CONF = [
     NAME = "s3",
+    SUNSTONE_NAME = "Amazon S3",
     REQUIRED_ATTRS = "ACCESS_KEY_ID,SECRET_ACCESS_KEY,REGION,BUCKET",
     APP_ACTIONS = "create, delete, monitor"
 ]
diff --git a/src/sunstone/public/app/tabs/files-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/files-tab/form-panels/create/wizard.hbs
index 30b964b481..cb4c923365 100644
--- a/src/sunstone/public/app/tabs/files-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/files-tab/form-panels/create/wizard.hbs
@@ -19,18 +19,11 @@
     <div class="medium-4 columns">
       <label for="file_name">
         {{tr "Name"}}
-        <span class="tip">
-          {{tr "Name that the File will get. Every file must have a unique name."}}
-        </span>
-      </label>
       <input required type="text" name="file_name" id="file_name" />
     </div>
     <div class="medium-8 columns">
       <label for="file_desc">
         {{tr "Description"}}
-        <span class="tip">
-          {{tr "Human readable description of the file for other users."}}
-        </span>
       </label>
       <textarea name="file_desc" id="file_desc" rows="4"></textarea>
     </div>
@@ -38,16 +31,7 @@
   <div class="row">
     <div class="medium-4 columns">
       <label for="file_type">
-        {{tr "Type"}}
-        <span class="tip">
-          {{tr "Type of the file."}}
-          <br/>
-          <br/>
-          {{tr  " KERNEL & RAMDISK files can be used in the OS Booting section of the Template wizard."}}
-          <br/>
-          <br/>
-          {{tr  " CONTEXT files can be included in the context CD-ROM, from the Context/Files section of the Template wizard."}}
-        </span>
+        {{tr "File type"}}
       </label>
       <select name="file_type" id="file_type">
         <option value="CONTEXT">{{tr "Context"}}</option>
@@ -58,7 +42,6 @@
     <div class="medium-8 columns">
       <label for="file_datastore">
         {{tr "Datastore"}}
-        <span class="tip">{{tr "Select the datastore for this file"}}</span>
       </label>
       <div id="file_datastore" name="file_datastore"></div>
     </div>
@@ -69,7 +52,7 @@
     <div class="row" id="src_path_select">
       <div class="large-12 columns text-center">
         <input type="radio" name="src_path" id="path_file" value="path">
-          <label for="path_file">{{tr "Provide a path"}}</label>
+          <label for="path_file">{{tr "Path in OpenNebula server"}}</label>
         </input>
         <input type="radio" name="src_path" id="upload_file" value="upload">
           <label for="upload_file">{{tr "Upload"}}</label>
@@ -81,9 +64,6 @@
       <div class="large-12 columns">
         <label for="file_path">
           {{tr "Path"}}
-          <span class="tip">
-            {{tr "Path to the original file that will be copied to the file repository."}}
-          </span>
         </label>
         <input type="text" name="file_path" id="file_path" />
       </div>
diff --git a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
index 37f3520e3d..f2f431112c 100644
--- a/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
@@ -19,18 +19,12 @@
     <div class="medium-4 columns">
       <label for="img_name">
         {{tr "Name"}}
-        <span class="tip">
-          {{tr "Name that the Image will get. Every image must have a unique name."}}
-        </span>
       </label>
       <input required type="text" name="img_name" id="img_name" />
     </div>
     <div class="medium-8 columns">
       <label for="img_desc">
         {{tr "Description"}}
-        <span class="tip">
-          {{tr "Human readable description of the image for other users."}}
-        </span>
       </label>
       <textarea name="img_desc" id="img_desc" rows="4"></textarea>
     </div>
@@ -38,30 +32,17 @@
   <div class="row">
     <div class="medium-4 columns">
       <label for="img_type">
-        {{tr "Type"}}
-        <span class="tip">
-          {{tr "Type of the image."}}
-          <br/>
-          <br/>
-          {{tr  "OS images contain a working operative system."}}
-          <br/>
-          <br/>
-          {{tr  "CDROM images are readonly data."}}
-          <br/>
-          <br/>
-          {{tr  "DATABLOCK images are a storage for data. They can be created from previous existing data, or as an empty drive."}}
-        </span>
+          {{tr "Type"}}
       </label>
       <select name="img_type" id="img_type">
-        <option value="OS">{{tr "OS"}}</option>
-        <option value="CDROM">{{tr "CDROM"}}</option>
-        <option value="DATABLOCK">{{tr "DATABLOCK"}}</option>
+        <option value="OS">{{tr "Operating System image"}}</option>
+        <option value="CDROM">{{tr "Readonly CD-ROM"}}</option>
+        <option value="DATABLOCK">{{tr "Generic storage datablock"}}</option>
       </select>
     </div>
     <div class="medium-8 columns">
       <label for="img_datastore">
         {{tr "Datastore"}}
-        <span class="tip">{{tr "Select the datastore for this image"}}</span>
       </label>
       <div id="img_datastore" name="img_datastore"></div>
     </div>
@@ -71,23 +52,22 @@
       <div class="large-4 columns">
         <input type="checkbox" id="img_persistent" name="img_persistent" value="YES" />
         <label for="img_persistent">
-          {{tr "Persistent"}}
-          <span class="tip">{{tr "Persistence of the image"}}</span>
+          {{tr "This image is persistent"}}
         </label>
       </div>
     </div>
   {{/isTabActionEnabled}}
   <br>
   <fieldset>
-    <legend>{{tr "Image location"}}:</legend>
+    <legend>{{tr "Image location"}}</legend>
     <div class="row" id="src_path_select">
       <div class="large-12 columns text-center">
         <input type="radio" name="src_path" id="path_image" value="path">
-        <label for="path_image">{{tr "Provide a path"}}</label>
+        <label for="path_image">{{tr "Path in OpenNebula server"}}</label>
         <input type="radio" name="src_path" id="upload_image" value="upload">
         <label for="upload_image">{{tr "Upload"}}</label>
         <input type="radio" name="src_path" id="datablock_img" value="datablock" disabled>
-        <label for="datablock_img">{{tr "Empty datablock"}}</label>
+        <label for="datablock_img">{{tr "Empty disk image"}}</label>
       </div>
     </div>
     <br>
@@ -95,9 +75,6 @@
       <div class="large-12 columns">
         <label for="img_path">
           {{tr "Path"}}
-          <span class="tip">
-            {{tr "Path to the original file that will be copied to the image repository. If not specified for a DATABLOCK type image, an empty image will be created."}}
-          </span>
         </label>
         <input type="text" name="img_path" id="img_path" />
       </div>
@@ -111,18 +88,13 @@
     <div class="img_size row">
       <div class="medium-6 columns">
         <label for="img_size">
-          {{tr "Size"}}
-          <span class="tip">{{tr "Size of the datablock in MB."}}</span>
+          {{tr "Size in MB"}}
         </label>
         <input type="text" name="img_size" id="img_size" />
       </div>
       <div class="medium-6 columns only_vcenter">
         <label for="disk_type">
-          {{tr "Disk Provisioning"}}
-          <span class="tip">
-            {{tr "Parameter to instruct vCenter on the type of disk to be created"}}
-            {{tr "The type of disk has implications on performance and occupied space. Values (careful with the case): delta,eagerZeroedThick,flatMonolithic,preallocated,raw,rdm,rdmp,seSparse,sparse2Gb,sparseMonolithic,thick,thick2Gb,thin. Default value is thin."}}
-          </span>
+          {{tr "Disk provisioning type"}}
         </label>
         <select name="disk_type" id="disk_type">
           <option value="" selected="selected"></option>
@@ -143,11 +115,7 @@
         <div class="row only_vcenter">
           <div class="large-12 columns">
             <label for="adapter_type">
-              {{tr "Controller"}}
-              <span class="tip">
-                {{tr "Controller for the image."}}
-                {{tr "Types of adapters used by virtual disks to plug into VMs. Values (careful with the case): lsiLogic, ide, busLogic."}}
-              </span>
+              {{tr "Bus adapter controller"}}
             </label>
             <select name="adapter_type" id="adapter_type">
               <option value="" selected="selected"></option>
@@ -165,9 +133,6 @@
           <div class="large-12 columns">
             <label for="img_dev_prefix">
               {{tr "BUS"}}
-              <span class="tip">
-                {{tr "The BUS where the image will be connected to. If a custom is selected the actual Device Prefix should be typed. For example: “hd”, “sd”. If omitted, the default value is the DEFAULT_DEV_PREFIX defined in oned.conf (installation default is “hd”)."}}
-              </span>
             </label>
             <select name="img_dev_prefix" id="img_dev_prefix">
               <option value="" selected="selected"></option>
@@ -184,10 +149,7 @@
         <div class="row not_vcenter">
           <div class="large-12 columns">
             <label for="img_driver">
-              {{tr "Driver"}}
-              <span class="tip">
-                {{tr "Specific image mapping driver. KVM: raw, qcow2."}}
-              </span>
+              {{tr "Image mapping driver"}}
             </label>
             <select name="img_driver" id="img_driver">
               <option value="raw" selected="selected">raw</option>
@@ -204,10 +166,7 @@
         <div class="row not_vcenter">
           <div class="large-12 columns">
             <label for="img_target">
-              {{tr "Target"}}
-              <span class="tip">
-                {{tr "Target on which the image will be mounted at. For example: hda, sdb..."}}
-              </span>
+              {{tr "Target device"}}
             </label>
             <input type="text" name="img_target" id="img_target" />
           </div>
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
index 3e85ec8994..481c14a147 100644
--- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create.js
@@ -43,56 +43,50 @@ define(function(require) {
   var MARKET_MAD_ATTRS = [
     {
       name: 'ENDPOINT',
-      label: Locale.tr("Endpoint"),
-      tooltip: Locale.tr("URL of AppMarket."),
+      label: Locale.tr("Endpoint URL for marketplace"),
       driver: 'one'
     },
     {
       name: 'BASE_URL',
-      label: Locale.tr("Base URL"),
-      tooltip: Locale.tr("URL base to generate app end points, where the PUBLIC_DIR is accessible."),
+      label: Locale.tr("Base URL for marketapp"),
       driver: 'http'
     },
     {
       name: 'PUBLIC_DIR',
-      label: Locale.tr("Public Directory"),
-      tooltip: Locale.tr("Absolute directory path to place images, the document root for http server, in the frontend or in the hosts pointed at by the BRIDGE_LIST directive."),
+      label: Locale.tr("Marketapp directory path"),
+      tooltip: Locale.tr("This is the document root for http server"),
       driver: 'http'
     },
     {
       name: 'BRIDGE_LIST',
-      label: Locale.tr("Bridge List"),
-      tooltip: Locale.tr("Comma separated list of servers to access the public directory. If not defined, public directory will be local"),
+      label: Locale.tr("Storage bridge list"),
+      tooltip: Locale.tr("Comma separated list of servers to access the image directory if not local"),
       driver: 'http'
     },
     {
       name: 'ACCESS_KEY_ID',
       label: Locale.tr("Access Key Id"),
-      tooltip: Locale.tr("The access key of the S3 user."),
       driver: 's3'
     },
     {
       name: 'SECRET_ACCESS_KEY',
       label: Locale.tr("Secret Access Key"),
-      tooltip: Locale.tr("The secret key of the S3 user."),
       driver: 's3'
     },
     {
       name: 'BUCKET',
-      label: Locale.tr("Bucket"),
-      tooltip: Locale.tr("The bucket where the files will be stored."),
+      label: Locale.tr("S3 bucket to store marketapps"),
       driver: 's3'
     },
     {
       name: 'REGION',
-      label: Locale.tr("Region"),
-      tooltip: Locale.tr("The region to connect to. If you are using Ceph-S3 any value here will work."),
+      label: Locale.tr("Amazon Region"),
+      tooltip: Locale.tr("Only if using public Amazon S3 service."),
       driver: 's3'
     },
     {
       name: 'TOTAL_MB',
-      label: Locale.tr("Total MB"),
-      tooltip: Locale.tr("This parameter defines the Total size of the MarketPlace in MB. It defaults to 1024 GB."),
+      label: Locale.tr("Total Marketplace size in MB"),
       driver: 's3'
     },
     {
@@ -103,8 +97,7 @@ define(function(require) {
     },
     {
       name: 'ENDPOINT',
-      label: Locale.tr("Endpoint"),
-      tooltip: Locale.tr("The URL of AppMarket."),
+      label: Locale.tr("Endpoint URL for marketplace"),
       driver: 's3'
     },
     {
@@ -115,8 +108,8 @@ define(function(require) {
     },
     {
       name: 'READ_LENGTH',
-      label: Locale.tr("Read Length"),
-      tooltip: Locale.tr("Split the file into chunks of this size (in MB). You should **never** user a quantity larger than 100. Defaults to 32 (MB)."),
+      label: Locale.tr("Read block length in MB"),
+      tooltip: Locale.tr("Split marketapps into chunks of this size (in MB). You should **never** user a quantity larger than 100. Defaults to 32 (MB)."),
       driver: 's3'
     }
   ]
@@ -145,7 +138,10 @@ define(function(require) {
     that.marketMadNameList = [];
     if (Config.onedConf.MARKET_MAD_CONF !== undefined) {
       $.each(Config.onedConf.MARKET_MAD_CONF, function(index, marketMad) {
-        that.marketMadNameList.push(marketMad["NAME"]);
+        that.marketMadNameList.push({
+            "mad" : marketMad["NAME"],
+            "name": marketMad["SUNSTONE_NAME"]
+        });
       });
     }
 
diff --git a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs
index 9df7356260..78b94464c8 100644
--- a/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/marketplaces-tab/form-panels/create/wizard.hbs
@@ -17,46 +17,44 @@
   <div class="row">
     <div class="medium-4 columns">
       <label for="NAME">
-        {{tr "Name"}}:
-        <span class="tip">
-          {{tr "Name that the Marketplace will get for description purposes."}}
-        </span>
+        {{tr "Name"}}
       </label>
       <input id="NAME" type="text" wizard_field="NAME" required/>
     </div>
-    <div class="medium-2 columns">
-      <label for="MARKET_MAD">{{tr "Driver"}}</label>
+    <div class="medium-8 columns">
+      <label for="DESCRIPTION">
+        {{tr "Description"}}
+      </label>
+      <textarea id="DESCRIPTION" wizard_field="DESCRIPTION" rows="2"></textarea>
+    </div>
+  </div>
+  <div class="row">
+    <div class="medium-4 columns">
+      <label for="MARKET_MAD">{{tr "Storage backend"}}</label>
       <select id="MARKET_MAD" wizard_field="MARKET_MAD" required>
         {{#each marketMadNameList}}
-        <option value="{{this}}">{{this}}</option>
+        <option value="{{this.mad}}">{{this.name}}</option>
         {{/each}}
       </select>
     </div>
-    <div class="medium-6 columns">
+    <div class="medium-8 columns">
     </div>
   </div>
-  <div class="row">
-    <div class="medium-6 columns">
-      <label for="DESCRIPTION">
-        {{tr "Description"}}
-        <span class="tip">
-          {{tr "Human readable description of the MarketPlace for other users."}}
-        </span>
-      </label>
-      <textarea id="DESCRIPTION" wizard_field="DESCRIPTION" rows="1"></textarea>
-    </div>
-    <div class="medium-6 columns">
-    </div>
-  </div>
-  <div class="row">
-    {{#each marketMadAttrs}}
-    <div class="medium-6 columns market-mad-attr-container {{this.driver}}">
-      <label for="{{this.name}}">
-        {{this.label}}:
-        <span class="tip">{{this.tooltip}}</span>
-      </label>
-      <input id="{{this.name}}" type="text" wizard_field="{{this.name}}"/>
-    </div>
-    {{/each}}
-  </div>
+  <br>
+  <fieldset>
+  <legend>{{tr "Configuration attributes"}}</legend>
+      <div class="row">
+        {{#each marketMadAttrs}}
+        <div class="medium-6 columns market-mad-attr-container {{this.driver}}">
+          <label for="{{this.name}}">
+            {{this.label}}
+            {{#if this.tooltip}} 
+            <span class="tip">{{this.tooltip}}</span>
+            {{/if}} 
+          </label>
+          <input id="{{this.name}}" type="text" wizard_field="{{this.name}}"/>
+        </div>
+        {{/each}}
+      </div>
+  </fieldset>
 </form>
\ No newline at end of file