diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index a69e8defe6..693ac8ac1e 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -3200,7 +3200,6 @@ function setupCreateTemplateDialog(){
                         '<button type="button" class="button tiny radius" id="add_context">'+tr("Add")+'</button>'+
                     '</div>'+
                   '</div>'+
-                  '<hr>'+
                   '<div class="row">'+
                       '<table id="context_table" class="twelve policies_table">'+
                          '<thead>'+
@@ -3723,11 +3722,9 @@ function setupCreateTemplateDialog(){
           '<div class="row">'+
             '<fieldset>'+
               '<legend>'+tr("RAW data")+'</legend>'+
-              '<div class="row">'+
               '<div class="six columns">'+
-                '<div class="row">'+
                   '<div class="four columns">'+
-                      '<label class="right inline" for="raw_type">'+tr("TYPE")+':</label>'+
+                      '<label class="inline" for="raw_type">'+tr("TYPE")+':</label>'+
                   '</div>'+
                   '<div class="six columns">'+
                       '<select id="raw_type" name="raw_type">'+
@@ -3739,27 +3736,24 @@ function setupCreateTemplateDialog(){
                   '</div>'+
                   '<div class="two columns">'+
                   '</div>'+
-                '</div>'+
               '</div>'+
-              '</div>'+
-              '<div class="row">'+
-                '<div class="six columns">'+
+                '<div class="twelve columns">'+
                   '<div class="twelve columns">'+
                       '<label class="" for="raw_data">'+tr("DATA")+':</label>'+
                   '</div>'+
                   '<div class="eleven columns">'+
-                    '<textarea rows="4" type="text" id="raw_data" name="raw_data" />'+
+                    '<textarea rows="2" type="text" id="raw_data" name="raw_data" />'+
                   '</div>'+
                   '<div class="one columns">'+
                     '<div class="tip">'+tr("Raw data to be passed directly to the hypervisor")+'.</div>'+
                   '</div>'+
                 '</div>'+
-                '<div class="six columns">'+
+                '<div id="data_vmx_div" class="twelve columns hidden">'+
                   '<div class="twelve columns">'+
                       '<label class="" for="raw_data_vmx">'+tr("DATA_VMX")+':</label>'+
                   '</div>'+
                   '<div class="eleven columns">'+
-                    '<textarea rows="4" type="text" id="raw_data_vmx" name="raw_data_vmx" />'+
+                    '<textarea rows="2" type="text" id="raw_data_vmx" name="raw_data_vmx" />'+
                   '</div>'+
                   '<div class="one columns">'+
                     '<div class="tip">'+tr("Raw data to be added directly to the .vmx file.")+'.</div>'+
@@ -3774,6 +3768,16 @@ function setupCreateTemplateDialog(){
       $("<dd><a href='#raw'>"+tr("Other")+"</a></dd>").appendTo($("dl#template_create_tabs"));
       $(html_tab_content).appendTo($("ul#template_create_tabs_content"));
 
+      $('#raw_type').change(function(){
+        var choice_str = $(this).val();
+        switch(choice_str) {
+          case 'vmware':
+            $("#data_vmx_div", dialog).show();
+            break;
+          default:
+            $("#data_vmx_div", dialog).hide();
+        }
+    });
     }
 
 
@@ -4700,9 +4704,9 @@ function fillTemplatePopUp(request, response){
           return $('<div/>').html(value).text();
         }
 
-        $('#raw_type').val(htmlDecode(raw['TYPE']));
-        $('#raw_data').val(htmlDecode(raw['DATA']));
-        $('#raw_data_vmx').val(htmlDecode(raw['DATA_VMX']));
+        $('#raw_type', raw_section).val(htmlDecode(raw['TYPE']));
+        $('#raw_data', raw_section).val(htmlDecode(raw['DATA']));
+        $('#raw_data_vmx', raw_section).val(htmlDecode(raw['DATA_VMX']));
     }
 
     popUpUpdateTemplateDialog();