diff --git a/app/views/spree/admin/product_properties/index.html.haml b/app/views/spree/admin/product_properties/index.html.haml
index 895beef33a..bcde9f77d5 100644
--- a/app/views/spree/admin/product_properties/index.html.haml
+++ b/app/views/spree/admin/product_properties/index.html.haml
@@ -62,7 +62,6 @@
 
 :javascript
   var properties = #{raw(@properties.to_json)};
-  console.log(properties)
   $("#product_properties input.autocomplete").live("keydown", function(){
     already_auto_completed = $(this).is('ac_input');
     if (!already_auto_completed) {
diff --git a/app/views/spree/admin/shared/_edit_resource_links.html.haml b/app/views/spree/admin/shared/_edit_resource_links.html.haml
new file mode 100644
index 0000000000..44db947bba
--- /dev/null
+++ b/app/views/spree/admin/shared/_edit_resource_links.html.haml
@@ -0,0 +1,4 @@
+.form-buttons.filter-actions.actions
+  = button Spree.t('actions.update'), 'icon-refresh'
+  %span.or= Spree.t(:or)
+  = button_link_to Spree.t('actions.cancel'), collection_url, icon: 'icon-remove'
diff --git a/app/views/spree/admin/shared/_product_sub_menu.html.haml b/app/views/spree/admin/shared/_product_sub_menu.html.haml
new file mode 100644
index 0000000000..385fbd9993
--- /dev/null
+++ b/app/views/spree/admin/shared/_product_sub_menu.html.haml
@@ -0,0 +1,6 @@
+- content_for :sub_menu do
+  %ul#sub_nav.inline-menu
+    = tab :products, match_path: '/products'
+    = tab :option_types, match_path: '/option_types'
+    = tab :properties
+    = tab :prototypes
diff --git a/app/views/spree/shared/_error_messages.html.haml b/app/views/spree/shared/_error_messages.html.haml
new file mode 100644
index 0000000000..54fabd313e
--- /dev/null
+++ b/app/views/spree/shared/_error_messages.html.haml
@@ -0,0 +1,11 @@
+- if target && target.errors.any?
+  #errorExplanation.errorExplanation
+    %h2
+      = Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.count)
+      \:
+    %p
+      = Spree.t(:there_were_problems_with_the_following_fields)
+      \:
+    %ul
+      - target.errors.full_messages.each do |msg|
+        %li= msg