diff --git a/app/models/concerns/fog_extensions/xenserver/server.rb b/app/models/concerns/fog_extensions/xenserver/server.rb
index 191cfd2..c57f4fd 100644
--- a/app/models/concerns/fog_extensions/xenserver/server.rb
+++ b/app/models/concerns/fog_extensions/xenserver/server.rb
@@ -2,6 +2,8 @@ module FogExtensions
   module Xenserver
     module Server
 
+      attr_accessor :memory_min, :memory_max, :custom_template_name, :builtin_template_name
+
       def to_s
         name
       end
@@ -10,14 +12,6 @@ def nics_attributes=(attrs); end
 
       def volumes_attributes=(attrs); end
 
-      def memory_min
-        memory_static_min.to_i
-      end
-
-      def memory_max
-        memory_static_max.to_i
-      end
-
       def memory
         memory_static_max.to_i
       end
@@ -38,14 +32,6 @@ def state
         power_state
       end
 
-      def custom_template_name
-        template_name
-      end
-
-      def builtin_template_name
-        template_name
-      end
-
     end
   end
 end
diff --git a/app/views/compute_resources_vms/form/_network.html.erb b/app/views/compute_resources_vms/form/_network.html.erb
index f7ee2bf..b98310f 100644
--- a/app/views/compute_resources_vms/form/_network.html.erb
+++ b/app/views/compute_resources_vms/form/_network.html.erb
@@ -4,6 +4,8 @@
      selected = ""
      if params && params['host'] && params['host']['compute_attributes']
        selected = params['host']['compute_attributes']['VIFs']['print']
+     elsif new.__vifs
+       selected = new.__vifs['print']
      end
   -%>
 
diff --git a/app/views/compute_resources_vms/form/_templates.html.erb b/app/views/compute_resources_vms/form/_templates.html.erb
index 0d44aee..78f6770 100644
--- a/app/views/compute_resources_vms/form/_templates.html.erb
+++ b/app/views/compute_resources_vms/form/_templates.html.erb
@@ -9,29 +9,12 @@
   %>
 
   <div id='templates' class=''>
-
-  <div class="form-group">
-   <label class="col-md-2 control-label" for="host_compute_attributes_custom_template_name">Custom template</label>
-   <div class="col-md-4">
-    <div class="controls">
-      <select class="form-control span2" id="host_compute_attributes_custom_template_name" name="host[compute_attributes][custom_template_name]">
-        <%= options_for_select([[_("No template"), ""]] + compute_resource.custom_templates.map { |t| [t.name, t.name] }, selected_item_c) %>
-      </select>
+    <div class="form-group">
+      <%= selectable_f f, :custom_template_name,[[_("No template"), ""]] + compute_resource.custom_templates.map { |t| [t.name, t.name] }, {}, :class => 'form-control span2', :label => 'Custom Template' %>
     </div>
-   </div>  
-  </div>
 
     <div class="form-group ">
-    <label class="col-md-2 control-label" for="host_compute_attributes_builtin_template_name">Built-in template</label>
-    <div class="col-md-4">
-    <div class="controls">
-      <select class="form-control span2" id="host_compute_attributes_builtin_template_name" name="host[compute_attributes][builtin_template_name]">
-        <%= options_for_select([[_("No template"), ""]] + compute_resource.builtin_templates.map { |t| [t.name, t.name] }, selected_item_b) %>
-      </select>
-    </div>
+      <%= selectable_f f, :builtin_template_name,[[_("No template"), ""]] + compute_resource.builtin_templates.map { |t| [t.name, t.name] }, {}, :class => 'form-control span2', :label => 'Builtin Template' %>
     </div>
-    </div>
-
   </div>
-
 </div>
\ No newline at end of file
diff --git a/app/views/compute_resources_vms/form/_volume.html.erb b/app/views/compute_resources_vms/form/_volume.html.erb
index 732177c..a1d8cb2 100644
--- a/app/views/compute_resources_vms/form/_volume.html.erb
+++ b/app/views/compute_resources_vms/form/_volume.html.erb
@@ -2,9 +2,12 @@
   <%
      selected = ""
      size = ""
-     if params && params['host'] && params['host']['compute_attributes']
+     if params && params['host'] && params['host']['compute_attributes'] && params['host']['compute_attributes']['VBDs']['physical_size'] != ""
        selected = params['host']['compute_attributes']['VBDs']['print']
        size     = params['host']['compute_attributes']['VBDs']['physical_size']
+     elsif new.__vbds
+       selected = new.__vbds['print']
+       size     = new.__vbds['physical_size']
      end
   -%>
   <%= selectable_f f, :print, compute_resource.storage_pools.map(&:name), { :selected => selected }, :class => "span2", :label => _("Storage Repository") %>
diff --git a/app/views/compute_resources_vms/form/_xenserver.html.erb b/app/views/compute_resources_vms/form/_xenserver.html.erb
index d7cddc9..bba92ab 100644
--- a/app/views/compute_resources_vms/form/_xenserver.html.erb
+++ b/app/views/compute_resources_vms/form/_xenserver.html.erb
@@ -3,65 +3,72 @@
    if params && params['host'] && params['host']['compute_attributes'] && params['host']['compute_attributes']['custom_template_name'] != ''
      hide_raw = 'display:none;'
    end
+
+   if controller_name == 'hosts'
+     fields_enabled = true
+   elsif controller_name == 'compute_attributes'
+     fields_enabled = true
+   else
+     fields_enabled = false
+   end
 -%>
 
 <div class="children_fields">
   <fieldset id="vm_profile">
     <legend>VM Profile</legend>
     <div class="fields">
-      <%= text_f f, :name, :disabled => !new if controller_name != 'hosts' %>
-      <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, {}, :class => 'input-mini', :disabled => !new, :label => 'vCPUs' %>
-      <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {}, :class => 'form-control span2', :disabled => !new, :label => 'Memory Min' %>
-      <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {}, :class => 'form-control span2', :disabled => !new, :label => 'Memory Max' %>
+      <%= text_f f, :name, :disabled => !fields_enabled, :label => 'Name' if controller_name != 'hosts' %>
+      <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, {}, :class => 'input-mini', :disabled => !fields_enabled, :label => 'vCPUs' %>
+      <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Min' %>
+      <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {}, :class => 'form-control span2', :disabled => !fields_enabled, :label => 'Memory Max' %>
     </div>
   </fieldset>
 </div>
 <!--Templates -->
 <div class="children_fields">
   <%= field_set_tag 'VM Template', :id => 'xen_templates', :title => _('Template') do -%>
-    <%= render 'compute_resources_vms/form/templates', :f => f, :compute_resource => compute_resource %>
+      <%= render 'compute_resources_vms/form/templates', :f => f, :compute_resource => compute_resource, :new => new %>
   <% end -%>
 </div>
 
 <!-- XenStore Data -->
 <div class="children_fields" id="xenserver-xenstore-data">
   <%= field_set_tag 'Xen Store Data', :id => 'xen_store_data', :title => _('Xen Store Data') do -%>
-    <%= render 'compute_resources_vms/form/xenstore', :f => f, :compute_resource => compute_resource, :new => new %>
+      <%= render 'compute_resources_vms/form/xenstore', :f => f, :compute_resource => compute_resource, :new => new %>
   <% end %>
 </div>
 
-
 <!--Storage-->
 <div class="children_fields xenserver-raw" id="xenserver-storage" style="<%= hide_raw %>">
   <%= new_child_fields_template(f, :VBDs, {
-      :object  => compute_resource.new_volume,
-      :partial => 'compute_resources_vms/form/volume', :form_builder_attrs => { :compute_resource => compute_resource } }) %>
+          :object  => compute_resource.new_volume,
+          :partial => 'compute_resources_vms/form/volume', :form_builder_attrs => { :compute_resource => compute_resource, :new => new  } }) %>
   <%= field_set_tag 'Storage', :id => 'storage_volumes', :title => _('Storage') do -%>
-    <%= f.fields_for :VBDs do |i| %>
-      <%= render 'compute_resources_vms/form/volume', :f => i, :compute_resource => compute_resource %>
-    <% end -%>
+      <%= f.fields_for :VBDs do |i| %>
+          <%= render 'compute_resources_vms/form/volume', :f => i, :compute_resource => compute_resource, :new => new %>
+      <% end -%>
   <% end -%>
 </div>
 
 <div class="children_fields" id="xenserver-network" style="<%= hide_raw %>">
   <%= field_set_tag 'Network interfaces', :id => 'network_interfaces', :title => _('Networks') do -%>
-    <%= f.fields_for :VIFs do |i| %>
-      <%= render 'compute_resources_vms/form/network', :f => i, :compute_resource => compute_resource %>
-    <% end -%>
+      <%= f.fields_for :VIFs do |i| %>
+          <%= render 'compute_resources_vms/form/network', :f => i, :compute_resource => compute_resource, :new => new %>
+      <% end -%>
   <% end -%>
 </div>
 
 <div class="children_fields" id="xenserver-vm-start" style="<%= hide_raw %>">
   <%= field_set_tag 'VM Startup Options', :id => 'vm_starup_options', :title => _('Power ON this machine') do -%>
-  <div class="form-group">
-   <label class="col-md-2 control-label" for="xenserver-vm-start-params">Power ON this VM</label>
-   <div class="col-md-4">
-    <div class="controls">
-	<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
-	<%= checkbox_f f, :start, { :checked => (checked == '1')} if new %>
-    </div>
-   </div>  
-  </div>
+      <div class="form-group">
+        <label class="col-md-2 control-label" for="xenserver-vm-start-params">Power ON this VM</label>
+        <div class="col-md-4">
+          <div class="controls">
+            <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
+            <%= checkbox_f f, :start, { :checked => (checked == '1')} if fields_enabled %>
+          </div>
+        </div>
+      </div>
   <% end -%>
 </div>
 
@@ -69,18 +76,18 @@
 
 <script type="text/javascript">
 
-  $(document).off('change.xenserver', '#host_compute_attributes_custom_template_name');
-  $(document).on('change.xenserver', '#host_compute_attributes_custom_template_name', function (data) {
-    if ($('option:selected', data.target).val() == "") {
-      $('.xenserver-raw').show(1000)
-    } else {
-      $('.xenserver-raw').hide(1000)
-    }
+    $(document).off('change.xenserver', '#host_compute_attributes_custom_template_name');
+    $(document).on('change.xenserver', '#host_compute_attributes_custom_template_name', function (data) {
+        if ($('option:selected', data.target).val() == "") {
+            $('.xenserver-raw').show(1000)
+        } else {
+            $('.xenserver-raw').hide(1000)
+        }
 
-  });
+    });
 
-  $(document).off('change.xenserver', '#host_compute_attributes_builtin_template_name');
-  $(document).on('change.xenserver', '#host_compute_attributes_builtin_template_name', function (data) {
-    $('.xenserver-raw').show(1000)
-  })
+    $(document).off('change.xenserver', '#host_compute_attributes_builtin_template_name');
+    $(document).on('change.xenserver', '#host_compute_attributes_builtin_template_name', function (data) {
+        $('.xenserver-raw').show(1000)
+    })
 </script>
diff --git a/app/views/compute_resources_vms/form/_xenstore.html.erb b/app/views/compute_resources_vms/form/_xenstore.html.erb
index dc113b5..b90ecf8 100644
--- a/app/views/compute_resources_vms/form/_xenstore.html.erb
+++ b/app/views/compute_resources_vms/form/_xenstore.html.erb
@@ -1,11 +1,11 @@
 <%
    vmdata = { :ifs         =>
-                  { '0' => {
-                      :ip      => '',
-                      :gateway => '',
-                      :netmask => ''
-                  }
-                  },
+                      { '0' => {
+                              :ip      => '',
+                              :gateway => '',
+                              :netmask => ''
+                      }
+                      },
               :nameserver1 => '',
               :nameserver2 => '',
               :environment => ''
@@ -31,100 +31,100 @@
 
   <div class="fields">
 
-      <div class="form-group">
+    <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-ip">vm-data/ifs/0/ip</label>
-          <div class="col-md-4">
-            <div class="controls">
-              <input <%= disabled %> id="xenstore-vm-data-ifs-0-ip" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][ip]" class="form-control input-mini" value="<%= ip %>">
-            </div>
-          </div>
+      <div class="col-md-4">
+        <div class="controls">
+          <input <%= disabled %> id="xenstore-vm-data-ifs-0-ip" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][ip]" class="form-control input-mini" value="<%= ip %>">
+        </div>
       </div>
+    </div>
 
-      <div class="form-group">
+    <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-gateway">vm-data/ifs/0/gateway</label>
-          <div class="col-md-4">
-             <div class="controls">
-              <input <%= disabled %> id="xenstore-vm-data-ifs-0-gateway" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][gateway]" class="form-control input-mini" value="<%= gateway %>">
-            </div>
-          </div>
+      <div class="col-md-4">
+        <div class="controls">
+          <input <%= disabled %> id="xenstore-vm-data-ifs-0-gateway" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][gateway]" class="form-control input-mini" value="<%= gateway %>">
+        </div>
       </div>
+    </div>
 
-      <div class="form-group">
+    <div class="form-group">
       <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-netmask">vm-data/ifs/0/netmask</label>
-          <div class="col-md-4">
-            <div class="controls">
-              <input <%= disabled %> id="xenstore-vm-data-ifs-0-netmask" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][netmask]" class="form-control input-mini" value="<%= netmask %>">
-            </div>
-          </div>
+      <div class="col-md-4">
+        <div class="controls">
+          <input <%= disabled %> id="xenstore-vm-data-ifs-0-netmask" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][netmask]" class="form-control input-mini" value="<%= netmask %>">
+        </div>
       </div>
+    </div>
 
-      <div class="form-group">
-        <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
-            <div class="col-md-4">
-              <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="form-control input-mini" value="<%= nameserver1 %>">
-            </div>
+    <div class="form-group">
+      <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
+      <div class="col-md-4">
+        <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="form-control input-mini" value="<%= nameserver1 %>">
       </div>
+    </div>
 
-      <div class="form-group">
-        <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
-        <div class="col-md-4">
-          <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= nameserver2 %>">
-        </div>
+    <div class="form-group">
+      <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
+      <div class="col-md-4">
+        <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= nameserver2 %>">
       </div>
+    </div>
 
-      <div class="form-group">
-        <label class="col-md-2 control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
-        <div class="col-md-4">
-          <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="form-control input-mini" value="<%= environment %>">
-        </div>
+    <div class="form-group">
+      <label class="col-md-2 control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
+      <div class="col-md-4">
+        <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="form-control input-mini" value="<%= environment %>">
       </div>
+    </div>
   </div>
 </div>
 
 
 <script type="text/javascript">
-  function autocomplete_xenstore(subnet_id) {
-    url = "/subnets/" + subnet_id + "/edit";
-    $.get(url, function (data) {
-      fields = $('#primary', data);
-      $('#xenstore-vm-data-ifs-0-gateway').val($('#subnet_gateway', fields).val());
-      $('#xenstore-vm-data-ifs-0-netmask').val($('#subnet_mask', fields).val());
-      $('#xenstore-vm-data-nameserver1').val($('#subnet_dns_primary', fields).val());
-      $('#xenstore-vm-data-nameserver2').val($('#subnet_dns_secondary', fields).val());
-      $('#xenstore-vm-data-ifs-0-ip').val($('#host_ip').val());
-      $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text())
-    })
-  }
-
-  subnet_id = $('#host_subnet_id option:selected').val();
-
-  if (subnet_id) {
-    autocomplete_xenstore(subnet_id)
-  }
-
-  $(document).off('change.xenstore', '#host_subnet_id');
-  $(document).on('change.xenstore', '#host_subnet_id', function (data) {
-    subnet_id = $('option:selected', data.target).val();
-    if (subnet_id) {
-      autocomplete_xenstore(subnet_id)
+    function autocomplete_xenstore(subnet_id) {
+        url = "/subnets/" + subnet_id + "/edit";
+        $.get(url, function (data) {
+            fields = $('#primary', data);
+            $('#xenstore-vm-data-ifs-0-gateway').val($('#subnet_gateway', fields).val());
+            $('#xenstore-vm-data-ifs-0-netmask').val($('#subnet_mask', fields).val());
+            $('#xenstore-vm-data-nameserver1').val($('#subnet_dns_primary', fields).val());
+            $('#xenstore-vm-data-nameserver2').val($('#subnet_dns_secondary', fields).val());
+            $('#xenstore-vm-data-ifs-0-ip').val($('#host_ip').val());
+            $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text())
+        })
     }
-  });
-
-  $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text());
 
-  $(document).off('change.xenstore', '#host_environment_id');
-  $(document).on('change.xenstore', '#host_environment_id', function (data) {
-    env = $('option:selected', data.target).text();
-    $('#xenstore-vm-data-environment').val(env)
-  });
-
-  $(document).off('click.xenstore', '#compute_resource_tab a');
-  $(document).on('click.xenstore', '#compute_resource_tab a', function (data) {
     subnet_id = $('#host_subnet_id option:selected').val();
 
     if (subnet_id) {
-      autocomplete_xenstore(subnet_id)
+        autocomplete_xenstore(subnet_id)
     }
-  })
+
+    $(document).off('change.xenstore', '#host_subnet_id');
+    $(document).on('change.xenstore', '#host_subnet_id', function (data) {
+        subnet_id = $('option:selected', data.target).val();
+        if (subnet_id) {
+            autocomplete_xenstore(subnet_id)
+        }
+    });
+
+    $('#xenstore-vm-data-environment').val($('#host_environment_id option:selected').text());
+
+    $(document).off('change.xenstore', '#host_environment_id');
+    $(document).on('change.xenstore', '#host_environment_id', function (data) {
+        env = $('option:selected', data.target).text();
+        $('#xenstore-vm-data-environment').val(env)
+    });
+
+    $(document).off('click.xenstore', '#compute_resource_tab a');
+    $(document).on('click.xenstore', '#compute_resource_tab a', function (data) {
+        subnet_id = $('#host_subnet_id option:selected').val();
+
+        if (subnet_id) {
+            autocomplete_xenstore(subnet_id)
+        }
+    })
 
 </script>
\ No newline at end of file