diff --git a/share/scripts/one b/share/scripts/one
index c5c6a2f711..8470db119e 100755
--- a/share/scripts/one
+++ b/share/scripts/one
@@ -235,9 +235,9 @@ case "$1" in
     restart)
         stop
         setup
-        start        
+        start
         echo "oned and scheduler restarted"
-        ;;        
+        ;;
     start-sched)
         start_sched
         ;;
diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js
index 81f0900446..7c6e9cb690 100644
--- a/src/sunstone/public/js/plugins/clusters-tab.js
+++ b/src/sunstone/public/js/plugins/clusters-tab.js
@@ -1030,7 +1030,7 @@ var cluster_actions = {
         call: OpenNebula.Cluster.update,
         callback: function(request,response){
            notifyMessage(tr("Cluster updated correctly"));
-           Sunstone.runAction('Cluster.show',response.CLUSTER.ID);
+           Sunstone.runAction('Cluster.showinfo',request.request.data[0][0]);
         },
         error: onError
     },
@@ -1054,7 +1054,7 @@ var cluster_actions = {
         call: OpenNebula.Cluster.rename,
         callback: function(request) {
             notifyMessage(tr("Cluster renamed correctly"));
-            Sunstone.runAction('Cluster.showinfo',request.request.data[0]);
+            Sunstone.runAction('Cluster.showinfo',request.request.data[0][0]);
             Sunstone.runAction('Cluster.list');
         },
         error: onError,
@@ -1236,7 +1236,7 @@ function updateClusterInfo(request,cluster){
         title : tr("Info"),
         icon: "fa-info-circle",
         content :
-        '<form class="custom"><div class="row">\
+        '<div class="row">\
         <div class="large-6 columns">\
         <table id="info_cluster_table" class="dataTable extended_table">\
             <thead>\
@@ -1265,8 +1265,7 @@ function updateClusterInfo(request,cluster){
                                          cluster_info.ID,
                                          tr("Attributes")) +
        '</div>\
-     </div>\
-     </form>'
+     </div>'
     }
 
     var cluster_host_tab = {
diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js
index 0cdae8dbd7..1609ba791c 100644
--- a/src/sunstone/public/js/plugins/files-tab.js
+++ b/src/sunstone/public/js/plugins/files-tab.js
@@ -195,7 +195,7 @@ var file_actions = {
         call: OpenNebula.Image.update,
         callback: function(request) {
             notifyMessage("Template updated correctly");
-            Sunstone.runAction('File.showinfo',request.request.data[0]);
+            Sunstone.runAction('File.showinfo',request.request.data[0][0]);
         },
         error: onError
     },
@@ -467,7 +467,7 @@ function updateFileInfo(request,file){
         title : tr("Info"),
         icon: "fa-info-circle",
         content:
-        '<form class="custom"><div class="row">\
+        '<div class="row">\
         <div class="large-6 columns">\
         <table id="info_file_table" class="dataTable extended_table">\
            <thead>\
@@ -540,8 +540,7 @@ function updateFileInfo(request,file){
                                                file_info.ID,
                                                "Attributes") +
        '</div>\
-     </div>\
-     </form>'
+     </div>'
     }
 
     $("#div_edit_chg_type_files_link").die();
diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js
index 63e141ab1a..b0b5a3c85e 100644
--- a/src/sunstone/public/js/plugins/groups-tab.js
+++ b/src/sunstone/public/js/plugins/groups-tab.js
@@ -69,12 +69,10 @@ var create_group_tmpl =
         </div>\
         <div class="row">\
           <div class="large-12 columns">\
-            <dl class="tabs" id="group_zones_tabs" data-tab>\
-            </dl>\
+            <dl class="tabs" id="group_zones_tabs" data-tab></dl>\
+            <div class="tabs-content group_zones_tabs_content"></div>\
           </div>\
         </div>\
-        <div class="tabs-content group_zones_tabs_content">\
-        </div>\
       </div>\
     </div>\
     <div id="administrators" class="row content">\
@@ -730,7 +728,7 @@ function setup_add_rp_dialog(group){
                 </dl>\
                 <div class="tabs-content group_zones_tabs_content">\
                 </div>\
-            </div>\
+             </div>\
             <div class="reveal-footer">\
               <div class="form_buttons">\
                 <button class="button radius right success" id="add_rp_submit">'+tr("Add")+'</button>\
@@ -925,7 +923,6 @@ function setup_group_resource_tab_content(zone_id, zone_section, str_zone_tab_id
         return true;
     });
 
-    // TODOO clicking "x" does not remove the cluster
     $( ".fa-times", zone_section ).live( "click", function() {
         $(this).parent().remove();
         var id = $(this).parent().attr("ID");
@@ -1046,6 +1043,8 @@ function update_datatable_group_clusters(datatable, zone_id, group) {
               }
               if (provider.CLUSTER_ID == "10")
                 $('#zone'+zone_id+'_add_rpresources_all').click();
+              else
+                $('#zone'+zone_id+'_add_rpresources_cluster').click();
             }
           });
         }
@@ -1071,7 +1070,7 @@ var add_resource_tab = function(zone_id, zone_name, dialog, id_suffix, group) {
     group_clusters_row_hash[zone_id] = {};
 
     // Append the new div containing the tab and add the tab to the list
-    var html_tab_content = '<div id="'+str_zone_tab_id+'Tab" class="content" style="display: block;">'+
+    var html_tab_content = '<div id="'+str_zone_tab_id+'Tab" class="content">'+
         generate_group_resource_tab_content(str_zone_tab_id, str_datatable_id, zone_id, group) +
         '</div>'
     $(html_tab_content).appendTo($(".group_zones_tabs_content", dialog));
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index 20364126dd..b70a954ccf 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -237,7 +237,7 @@ var host_actions = {
         call: OpenNebula.Host.update,
         callback: function(request) {
             notifyMessage(tr("Template updated correctly"));
-            Sunstone.runAction('Host.showinfo',request.request.data[0]);
+            Sunstone.runAction('Host.showinfo',request.request.data[0][0]);
         },
         error: onError
     },
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index 6ac21823a1..41f34e36bc 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -630,7 +630,7 @@ function updateImageInfo(request,img){
         title : tr("Info"),
         icon: "fa-info-circle",
         content:
-        '<form class="custom"><div class="row">\
+        '<div class="row">\
         <div class="large-6 columns">\
         <table id="info_img_table" class="dataTable extended_table">\
            <thead>\
@@ -711,8 +711,7 @@ function updateImageInfo(request,img){
                                                img_info.ID,
                                                "Attributes") +
        '</div>\
-     </div>\
-     </form>'
+     </div>'
     }
 
     $("#div_edit_chg_type_link").die();
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index 71410e975e..1864082566 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -480,7 +480,7 @@ var vnet_actions = {
         call: OpenNebula.Network.update,
         callback: function(request) {
             notifyMessage("Template updated correctly");
-            Sunstone.runAction('Network.showinfo',request.request.data[0]);
+            Sunstone.runAction('Network.showinfo',request.request.data[0][0]);
         },
         error: onError
     },
diff --git a/src/sunstone/public/js/plugins/zones-tab.js b/src/sunstone/public/js/plugins/zones-tab.js
index fa22d6b9b8..5450bd0870 100644
--- a/src/sunstone/public/js/plugins/zones-tab.js
+++ b/src/sunstone/public/js/plugins/zones-tab.js
@@ -322,7 +322,7 @@ function updateZoneInfo(request,zone){
         title : tr("Info"),
         icon: "fa-info-circle",
         content :
-        '<form class="custom"><div class="row">\
+        '<div class="row">\
         <div class="large-6 columns">\
         <table id="info_zone_table" class="dataTable extended_table">\
             <thead>\
@@ -351,8 +351,7 @@ function updateZoneInfo(request,zone){
                                            zone_info.ID,
                                            "Attributes") +
          '</div>\
-        </div>\
-        </form>'
+        </div>'
     }
 
     //Sunstone.updateInfoPanelTab(info_panel_name,tab_name, new tab object);