diff --git a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
deleted file mode 100644
index 538ca95fbf..0000000000
--- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
+++ /dev/null
@@ -1,99 +0,0 @@
-/ replace "fieldset[data-hook='new_product']"
-.twelve.columns.alpha
-  %fieldset.no-border-bottom{ id: "new_product" }
-    %legend{align: "center"}= t(:new_product)
-    .twelve.columns.alpha
-      .six.columns.alpha
-        = f.field_container :supplier do
-          = f.label :supplier_id, t(:supplier)
-          %span.required *
-          = f.collection_select(:supplier_id, @producers, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
-          = f.error_message_on :supplier
-      .six.columns.omega
-        = f.field_container :name do
-          = f.label :name, t(:product_name)
-          %span.required *
-          %br/
-          = f.text_field :name, :class => 'fullwidth title'
-          = f.error_message_on :name
-    .twelve.columns.alpha{ 'ng-controller' => 'unitsCtrl' }
-      .six.columns.alpha
-        = f.field_container :units do
-          = f.label :variant_unit_with_scale, t(:units)
-          %select.select2.fullwidth{ id: 'product_variant_unit_with_scale', 'ng-model' => 'product.variant_unit_with_scale', 'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options' }
-            %option{'value' => '', 'ng-hide' => "hasUnit(product)"}
-          %input{ type: 'hidden', 'ng-value' => 'product.variant_unit', name: 'product[variant_unit]' }
-          %input{ type: 'hidden', 'ng-value' => 'product.variant_unit_scale', name: 'product[variant_unit_scale]' }
-      .three.columns
-        = f.field_container :unit_value do
-          = f.label :product_unit_value_with_description, t(:value), 'ng-disabled' => "!hasUnit(product)"
-          %input.fullwidth{ id: 'product_unit_value_with_description', 'ng-model' => 'product.master.unit_value_with_description', :type => 'text', placeholder: "eg. 2", 'ng-disabled' => "!hasUnit(product)" }
-          %input{ type: 'hidden', 'ng-value' => 'product.master.unit_value', name: 'product[unit_value]' }
-          %input{ type: 'hidden', 'ng-value' => 'product.master.unit_description', name: 'product[unit_description]' }
-      = render 'display_as', f: f
-      .three.columns.omega{ 'ng-show' => "product.variant_unit_with_scale == 'items'" }
-        = f.field_container :unit_name do
-          = f.label :product_variant_unit_name, t(:unit_name)
-          %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => t('admin.products.unit_name_placeholder'), :type => 'text' }
-    .twelve.columns.alpha
-      .six.columns.alpha
-        = render 'spree/admin/products/primary_taxon_form', f: f
-      .two.columns
-        = f.field_container :price do
-          = f.label :price, t(:price)
-          %span.required *
-          %br/
-          = f.text_field :price, class: 'fullwidth'
-          = f.error_message_on :price
-      .two.columns
-        = f.field_container :on_hand do
-          = f.label :on_hand, t(:on_hand)
-          %span.required *
-          %br/
-          = f.text_field :on_hand, class: 'fullwidth'
-          = f.error_message_on :on_hand
-      .two.columns.omega
-        = f.field_container :on_demand do
-          = f.label :on_demand, t(:on_demand)
-          %br/
-          = f.check_box :on_demand
-          = f.error_message_on :on_demand
-    .twelve.columns.alpha
-      .six.columns.alpha  
-      .three.columns
-        - if Spree::TaxCategory.any?
-          = render 'spree/admin/products/tax_category_form', f: f
-        - else
-           
-      .three.columns.omega
-        = render 'spree/admin/products/shipping_category_form', f: f
-
-    .twelve.columns.alpha
-      = f.field_container :description do
-        = f.label :product_description, t(:product_description)
-        %br/
-        %text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"}
-        = f.error_message_on :description
-.four.columns.omega{ style: "text-align: center" }
-  %fieldset.no-border-bottom{ id: "image" }
-    %legend{align: "center"}= t(:image)
-    .row
-      = image_tag "noimage/product.png", class: "four columns alpha"
-    .row
-      = f.fields_for 'images_attributes[]', f.object.images.build do |image_fields|
-        = image_fields.file_field :attachment
-.sixteen.columns.alpha
-  .form-buttons.filter-actions.actions{ 'data-hook' => "buttons" }
-    = button t('actions.create'), 'icon-ok', :submit, value: "create"
-    %span.or
-      = t(:or)
-    = button t('actions.create_and_add_another'), 'icon-repeat', :submit, value: 'add_another'
-    %span.or
-      = t(:or)
-    = link_to_with_icon 'icon-remove', t('actions.cancel'), admin_products_path, :class => 'button'
-
-
-:javascript
-  angular.element(document.getElementById("new_product")).ready(function() {
-    angular.bootstrap(document.getElementById("new_product"), ['admin.products']);
-  });
diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml
new file mode 100644
index 0000000000..5f8aa2183d
--- /dev/null
+++ b/app/views/spree/admin/products/new.html.haml
@@ -0,0 +1,117 @@
+= render :partial => 'spree/admin/shared/product_sub_menu'
+= render :partial => 'spree/shared/error_messages', :locals => { :target => @product }
+= form_for [:admin, @product], :html => { :multipart => true } do |f|
+  .twelve.columns.alpha
+    %fieldset.no-border-bottom{ id: "new_product" }
+      %legend{align: "center"}= t(:new_product)
+      .twelve.columns.alpha
+        .six.columns.alpha
+          = f.field_container :supplier do
+            = f.label :supplier_id, t(:supplier)
+            %span.required *
+            = f.collection_select(:supplier_id, @producers, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
+            = f.error_message_on :supplier
+        .six.columns.omega
+          = f.field_container :name do
+            = f.label :name, t(:product_name)
+            %span.required *
+            %br/
+            = f.text_field :name, :class => 'fullwidth title'
+            = f.error_message_on :name
+      .twelve.columns.alpha{ 'ng-controller' => 'unitsCtrl' }
+        .six.columns.alpha
+          = f.field_container :units do
+            = f.label :variant_unit_with_scale, t(:units)
+            %select.select2.fullwidth{ id: 'product_variant_unit_with_scale', 'ng-model' => 'product.variant_unit_with_scale', 'ng-options' => 'unit[1] as unit[0] for unit in variant_unit_options' }
+              %option{'value' => '', 'ng-hide' => "hasUnit(product)"}
+            %input{ type: 'hidden', 'ng-value' => 'product.variant_unit', name: 'product[variant_unit]' }
+            %input{ type: 'hidden', 'ng-value' => 'product.variant_unit_scale', name: 'product[variant_unit_scale]' }
+        .three.columns
+          = f.field_container :unit_value do
+            = f.label :product_unit_value_with_description, t(:value), 'ng-disabled' => "!hasUnit(product)"
+            %input.fullwidth{ id: 'product_unit_value_with_description', 'ng-model' => 'product.master.unit_value_with_description', :type => 'text', placeholder: "eg. 2", 'ng-disabled' => "!hasUnit(product)" }
+            %input{ type: 'hidden', 'ng-value' => 'product.master.unit_value', name: 'product[unit_value]' }
+            %input{ type: 'hidden', 'ng-value' => 'product.master.unit_description', name: 'product[unit_description]' }
+        = render 'display_as', f: f
+        .three.columns.omega{ 'ng-show' => "product.variant_unit_with_scale == 'items'" }
+          = f.field_container :unit_name do
+            = f.label :product_variant_unit_name, t(:unit_name)
+            %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => t('admin.products.unit_name_placeholder'), :type => 'text' }
+      .twelve.columns.alpha
+        .six.columns.alpha
+          = render 'spree/admin/products/primary_taxon_form', f: f
+        .two.columns
+          = f.field_container :price do
+            = f.label :price, t(:price)
+            %span.required *
+            %br/
+            = f.text_field :price, class: 'fullwidth'
+            = f.error_message_on :price
+        .two.columns
+          = f.field_container :on_hand do
+            = f.label :on_hand, t(:on_hand)
+            %span.required *
+            %br/
+            = f.text_field :on_hand, class: 'fullwidth'
+            = f.error_message_on :on_hand
+        .two.columns.omega
+          = f.field_container :on_demand do
+            = f.label :on_demand, t(:on_demand)
+            %br/
+            = f.check_box :on_demand
+            = f.error_message_on :on_demand
+      .twelve.columns.alpha
+        .six.columns.alpha  
+        .three.columns
+          - if Spree::TaxCategory.any?
+            = render 'spree/admin/products/tax_category_form', f: f
+          - else
+             
+        .three.columns.omega
+          = render 'spree/admin/products/shipping_category_form', f: f
+
+      .twelve.columns.alpha
+        = f.field_container :description do
+          = f.label :product_description, t(:product_description)
+          %br/
+          %text-angular{'id' => 'product_description', 'name' => 'product[description]', 'class' => 'text-angular', 'textangular-strip' => true, 'ta-paste' => "stripFormatting($html)", 'ta-toolbar' => "[['bold','italics','clear']]"}
+          = f.error_message_on :description
+  .four.columns.omega{ style: "text-align: center" }
+    %fieldset.no-border-bottom{ id: "image" }
+      %legend{align: "center"}= t(:image)
+      .row
+        = image_tag "noimage/product.png", class: "four columns alpha"
+      .row
+        = f.fields_for 'images_attributes[]', f.object.images.build do |image_fields|
+          = image_fields.file_field :attachment
+  .sixteen.columns.alpha
+    .form-buttons.filter-actions.actions
+      = button t('actions.create'), 'icon-ok', :submit, value: "create"
+      %span.or
+        = t(:or)
+      = button t('actions.create_and_add_another'), 'icon-repeat', :submit, value: 'add_another'
+      %span.or
+        = t(:or)
+      = link_to_with_icon 'icon-remove', t('actions.cancel'), admin_products_path, :class => 'button'
+
+
+:javascript
+  angular.element(document.getElementById("new_product")).ready(function() {
+    angular.bootstrap(document.getElementById("new_product"), ['admin.products']);
+  });
+:javascript
+    (function($){
+      var base_url = "#{admin_prototypes_url}";
+      var prototype_select = $('#product_prototype_id');
+      prototype_select.change(function() {
+        var id = prototype_select.val();
+        if (id.length) {
+          $('#product-from-prototype').load([ base_url, id ].join("/"));
+        } else {
+          $('#product-from-prototype').empty();
+        }
+      })
+      if (prototype_select.html() == "") {
+        prototype_select.change();
+      }
+    })(jQuery);
diff --git a/app/views/spree/admin/products/new.js.erb b/app/views/spree/admin/products/new.js.erb
index 0a3711620d..4a2f6a3cef 100644
--- a/app/views/spree/admin/products/new.js.erb
+++ b/app/views/spree/admin/products/new.js.erb
@@ -1,5 +1,5 @@
 <%# This chunk is just a copy of Spree's core/app/views/spree/admin/products/new.js.erb %>
-$("#new_product").html('<%= escape_javascript(render :template => "spree/admin/products/new", :formats => [:html], :handlers => [:erb]) %>');
+$("#new_product").html('<%= escape_javascript(render :template => "spree/admin/products/new", :formats => [:html], :handlers => [:haml]) %>');
 handle_date_picker_fields();
 <% unless Rails.env.test? %>
   $('.select2').select2();