diff --git a/app/assets/images/spinner.gif b/app/assets/images/spinner.gif
new file mode 100644
index 0000000000..877f43f662
Binary files /dev/null and b/app/assets/images/spinner.gif differ
diff --git a/app/controllers/user_registrations_controller.rb b/app/controllers/user_registrations_controller.rb
index e8e75dc5ee..787c8a9011 100644
--- a/app/controllers/user_registrations_controller.rb
+++ b/app/controllers/user_registrations_controller.rb
@@ -21,10 +21,6 @@ class UserRegistrationsController < Spree::UserRegistrationsController
     associate_user
 
     respond_to do |format|
-      format.html do
-        set_flash_message(:success, :signed_up_but_unconfirmed)
-        redirect_to after_sign_in_path_for(@user)
-      end
       format.js do
         render json: { email: @user.email }
       end
@@ -39,9 +35,6 @@ class UserRegistrationsController < Spree::UserRegistrationsController
   def render_error(errors = {})
     clean_up_passwords(resource)
     respond_to do |format|
-      format.html do
-        render :new
-      end
       format.js do
         render json: errors, status: :unauthorized
       end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
deleted file mode 100644
index 4b8bfa1b1e..0000000000
--- a/app/views/layouts/application.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :file => 'spree/layouts/spree_application' %>
diff --git a/app/views/spree/checkout/payment/_check.html.erb b/app/views/spree/checkout/payment/_check.html.erb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/views/spree/shared/_google_analytics.html.erb b/app/views/spree/shared/_google_analytics.html.erb
new file mode 100644
index 0000000000..3098059e9c
--- /dev/null
+++ b/app/views/spree/shared/_google_analytics.html.erb
@@ -0,0 +1,39 @@
+<% if tracker = Spree::Tracker.current %>
+
+  <%= javascript_tag do %>
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
+    _gaq.push(['_trackPageview']);
+
+    <% if flash[:commerce_tracking] && @order.present? %>
+      <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
+      _gaq.push(['_addTrans',
+        "<%= j @order.number %>",
+        "",
+        "<%= @order.total %>",
+        "<%= @order.adjustments.tax.sum(:amount) %>",
+        "<%= @order.adjustments.shipping.sum(:amount) %>",
+        "<%= j @order.bill_address.city %>",
+        "<%= j @order.bill_address.state_text %>",
+        "<%= j @order.bill_address.country.name %>"
+      ]);
+      <% @order.line_items.each do |line_item| %>
+        _gaq.push(['_addItem',
+          "<%= j @order.number %>",
+          "<%= j line_item.variant.sku %>",
+          "<%= j line_item.variant.product.name %>",
+          "",
+          "<%= line_item.price %>",
+          "<%= line_item.quantity %>"
+        ]);
+      <% end %>
+      _gaq.push(['_trackTrans']);
+    <% end %>
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = '//google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  <% end %>
+<% end %>
diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb
index 22d14b383f..ae2f671a2e 100644
--- a/spec/controllers/user_registrations_controller_spec.rb
+++ b/spec/controllers/user_registrations_controller_spec.rb
@@ -59,32 +59,4 @@ describe UserRegistrationsController, type: :controller do
       cookies[:locale] = original_locale_cookie
     end
   end
-
-  context "when registration fails" do
-    it "renders new" do
-      spree_post :create, spree_user: {}
-      expect(response.status).to eq(200)
-      expect(response).to render_template "spree/user_registrations/new"
-    end
-  end
-
-  context "when registration succeeds" do
-    context "when referer is not '/checkout'" do
-      it "redirects to root" do
-        spree_post :create, spree_user: {email: "test@test.com", password: "testy123", password_confirmation: "testy123"}, :use_route => :spree
-        expect(response).to redirect_to root_path
-        expect(assigns[:user].email).to eq("test@test.com")
-      end
-    end
-
-    context "when referer is '/checkout'" do
-      before { @request.env['HTTP_REFERER'] = 'http://test.com/checkout' }
-
-      it "redirects to checkout" do
-        spree_post :create, spree_user: {email: "test@test.com", password: "testy123", password_confirmation: "testy123"}, :use_route => :spree
-        expect(response).to redirect_to checkout_path
-        expect(assigns[:user].email).to eq("test@test.com")
-      end
-    end
-  end
 end