diff --git a/Gemfile.lock b/Gemfile.lock
index 601c36a..758d4db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,28 +41,27 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_list (0.7.2)
+    acts_as_list (0.7.4)
       activerecord (>= 3.0)
     addressable (2.4.0)
     arel (6.0.3)
-    autoprefixer-rails (6.3.1)
+    autoprefixer-rails (6.3.6.2)
       execjs
-      json
     awesome_nested_set (3.0.3)
       activerecord (>= 4.0.0, < 5)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bourbon (4.2.6)
+    bourbon (4.2.7)
       sass (~> 3.4)
       thor (~> 0.19)
     builder (3.2.2)
-    byebug (8.2.1)
+    byebug (9.0.5)
     camertron-eprun (1.1.0)
-    cancancan (1.13.1)
+    cancancan (1.15.0)
     canonical-rails (0.0.11)
       rails (>= 3.1, < 5.0)
     carmen (1.0.2)
@@ -72,7 +71,7 @@ GEM
       activesupport (>= 3.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
@@ -81,8 +80,8 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.7.7)
-    concurrent-ruby (1.0.0)
-    css_parser (1.3.7)
+    concurrent-ruby (1.0.2)
+    css_parser (1.4.2)
       addressable
     debug_inspector (0.0.2)
     deface (1.0.2)
@@ -90,7 +89,7 @@ GEM
       nokogiri (~> 1.6.0)
       polyglot
       rails (>= 3.1)
-    devise (3.5.3)
+    devise (3.5.10)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -100,10 +99,10 @@ GEM
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     ffaker (1.32.1)
-    font-awesome-rails (4.5.0.0)
-      railties (>= 3.2, < 5.0)
+    font-awesome-rails (4.6.3.0)
+      railties (>= 3.2, < 5.1)
     friendly_id (5.1.0)
       activerecord (>= 4.0.0)
     globalid (0.3.6)
@@ -116,35 +115,38 @@ GEM
     highline (1.6.21)
     htmlentities (4.3.4)
     i18n (0.7.0)
-    jbuilder (2.4.0)
+    jbuilder (2.5.0)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.1.0)
-      rails-dom-testing (~> 1.0)
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    kaminari (0.16.3)
+    kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.99)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     monetize (1.4.0)
       money (~> 6.7)
-    money (6.7.0)
+    money (6.7.1)
       i18n (>= 0.6.4, <= 0.7.0)
       sixarm_ruby_unaccent (>= 1.1.1, < 2)
-    multi_json (1.11.2)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
     paperclip (4.2.4)
       activemodel (>= 3.2.0)
@@ -154,14 +156,15 @@ GEM
     paranoia (2.1.5)
       activerecord (~> 4.0)
     pg (0.18.4)
+    pkg-config (1.1.7)
     polyamorous (1.3.0)
       activerecord (>= 3.0)
     polyglot (0.3.5)
     premailer (1.8.6)
       css_parser (>= 1.3.6)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.0)
-      actionmailer (>= 3, < 5)
+    premailer-rails (1.9.3)
+      actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -198,17 +201,18 @@ GEM
       activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.2.2)
     ransack (1.6.6)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.2)
-    rdoc (4.2.1)
-    responders (2.1.1)
+    rdoc (4.2.2)
+      json (~> 1.4)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
-    sass (3.4.21)
+    sass (3.4.22)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -222,32 +226,32 @@ GEM
       thor (~> 0.14)
     sixarm_ruby_unaccent (1.1.1)
     slop (3.6.0)
-    solidus (1.2.0)
-      solidus_api (= 1.2.0)
-      solidus_backend (= 1.2.0)
-      solidus_core (= 1.2.0)
-      solidus_frontend (= 1.2.0)
-      solidus_sample (= 1.2.0)
-    solidus_api (1.2.0)
+    solidus (1.2.2)
+      solidus_api (= 1.2.2)
+      solidus_backend (= 1.2.2)
+      solidus_core (= 1.2.2)
+      solidus_frontend (= 1.2.2)
+      solidus_sample (= 1.2.2)
+    solidus_api (1.2.2)
       rabl (>= 0.9.4.pre1, < 0.12.0)
-      solidus_core (= 1.2.0)
+      solidus_core (= 1.2.2)
       versioncake (~> 2.3.1)
-    solidus_auth_devise (1.3.0)
+    solidus_auth_devise (1.4.0)
       deface (~> 1.0.0)
       devise (~> 3.5.1)
       devise-encryptable (= 0.1.2)
       json
       multi_json
-      solidus_core (>= 1.1.0.alpha, < 2)
-    solidus_backend (1.2.0)
+      solidus_core (>= 1.0.6, < 2)
+    solidus_backend (1.2.2)
       bourbon (>= 4, < 6)
       handlebars_assets (~> 0.23)
       jquery-rails
       jquery-ui-rails (~> 5.0.0)
       select2-rails (= 3.5.9.1)
-      solidus_api (= 1.2.0)
-      solidus_core (= 1.2.0)
-    solidus_core (1.2.0)
+      solidus_api (= 1.2.2)
+      solidus_core (= 1.2.2)
+    solidus_core (1.2.2)
       activemerchant (~> 1.48.0)
       acts_as_list (~> 0.3)
       awesome_nested_set (~> 3.0.1)
@@ -270,53 +274,52 @@ GEM
       stringex (~> 1.5.1)
       truncate_html (= 0.9.2)
       twitter_cldr (~> 3.0)
-    solidus_frontend (1.2.0)
+    solidus_frontend (1.2.2)
       canonical-rails (~> 0.0.4)
       jquery-rails
-      solidus_api (= 1.2.0)
-      solidus_core (= 1.2.0)
-    solidus_sample (1.2.0)
-      solidus_core (= 1.2.0)
-    spring (1.6.2)
-    sprockets (3.5.2)
+      solidus_api (= 1.2.2)
+      solidus_core (= 1.2.2)
+    solidus_sample (1.2.2)
+      solidus_core (= 1.2.2)
+    spring (1.7.1)
+    sprockets (3.6.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     state_machines (0.4.0)
-    state_machines-activemodel (0.3.0)
-      activemodel (~> 4.1)
+    state_machines-activemodel (0.4.0)
+      activemodel (>= 4.1, < 5.1)
       state_machines (>= 0.4.0)
-    state_machines-activerecord (0.3.0)
-      activerecord (~> 4.1)
+    state_machines-activerecord (0.4.0)
+      activerecord (>= 4.1, < 5.1)
       state_machines-activemodel (>= 0.3.0)
     stringex (1.5.1)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
     truncate_html (0.9.2)
     turbolinks (2.5.3)
       coffee-rails
-    twitter_cldr (3.2.1)
+    twitter_cldr (3.3.0)
       camertron-eprun
       cldr-plurals-runtime-rb (~> 1.0.0)
       json
       tzinfo
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    uglifier (3.0.0)
+      execjs (>= 0.3.0, < 3)
     versioncake (2.3.1)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
       railties (>= 3.2)
       tzinfo
-    warden (1.2.4)
+    warden (1.2.6)
       rack (>= 1.0)
-    web-console (2.2.1)
+    web-console (2.3.0)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
@@ -344,4 +347,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.3
diff --git a/app/assets/stylesheets/spree/frontend/base.sass b/app/assets/stylesheets/spree/frontend/base.sass
index 318e748..e641186 100644
--- a/app/assets/stylesheets/spree/frontend/base.sass
+++ b/app/assets/stylesheets/spree/frontend/base.sass
@@ -5,3 +5,29 @@ a
 footer.footer
   > div
     padding: 20px 0px 20px 0px
+
+// Flash
+.alert-error
+  background-color: #f2dede
+  border-color: #eed3d7
+  color: #b94a48
+  text-align: left
+
+.alert-alert
+  background-color: #f2dede
+  border-color: #eed3d7
+  color: #b94a48
+  text-align: left
+ 
+
+.alert-success
+  background-color: #dff0d8
+  border-color: #d6e9c6
+  color: #468847
+  text-align: left
+
+.alert-notice
+  background-color: #dff0d8
+  border-color: #d6e9c6
+  color: #468847
+  text-align: left
diff --git a/app/helpers/spree/base_helper_decorator.rb b/app/helpers/spree/base_helper_decorator.rb
index 4a4afb4..5cac2ec 100644
--- a/app/helpers/spree/base_helper_decorator.rb
+++ b/app/helpers/spree/base_helper_decorator.rb
@@ -7,6 +7,17 @@ def layout_partial
     end
   end
 
+  def flash_messages(opts = {})
+    ignore_types = ["order_completed"].concat(Array(opts[:ignore_types]).map(&:to_s) || [])
+
+    flash.each do |msg_type, text|
+      unless ignore_types.include?(msg_type)
+        concat(content_tag :div, text, class: "flash alert alert-#{msg_type}")
+      end
+    end
+    nil
+  end
+
   def logo(image_path=Spree::Config[:logo], img_options: {}, link_options: {})
   	link_to image_tag(image_path, img_options), spree.root_path, link_options
   end
diff --git a/app/helpers/spree/checkout_helper_decorator.rb b/app/helpers/spree/checkout_helper_decorator.rb
new file mode 100644
index 0000000..a5a3b98
--- /dev/null
+++ b/app/helpers/spree/checkout_helper_decorator.rb
@@ -0,0 +1,28 @@
+module Spree::CheckoutHelper
+  def checkout_progress
+    states = checkout_states
+    items = states.map do |state|
+      text = Spree.t("order_state.#{state}").titleize
+
+      css_classes = ['disabled']
+      current_index = states.index(@order.state)
+      state_index = states.index(state)
+
+      if state_index < current_index
+        css_classes = []
+        css_classes << 'completed'
+        text = link_to text, checkout_state_path(state)
+      else
+        text = link_to text, '#'
+      end
+
+      css_classes << 'next' if state_index == current_index + 1
+      css_classes << 'active' if state == @order.state
+      css_classes << 'first' if state_index == 0
+      css_classes << 'last' if state_index == states.length - 1
+      # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
+      content_tag('li', text, class: css_classes)
+    end
+    content_tag('ol', raw(items.join("\n")), class: 'progress-steps nav nav-pills nav-justified', id: "checkout-step-#{@order.state}")
+  end
+end
\ No newline at end of file
diff --git a/app/views/spree/address/_form.html.erb b/app/views/spree/address/_form.html.erb
new file mode 100644
index 0000000..a4e0e1a
--- /dev/null
+++ b/app/views/spree/address/_form.html.erb
@@ -0,0 +1,75 @@
+<% address_id = address_type.chars.first %>
+<div class="inner" data-hook=<%="#{address_type}_inner" %>>
+  <div class="field form-group" id=<%="#{address_id}firstname" %>>
+    <%= form.label :firstname, Spree.t(:first_name) %><span class="required">*</span>
+    <%= form.text_field :firstname, :class => 'required form-control' %>
+  </div>
+  <div class="field form-group" id=<%="#{address_id}lastname" %>>
+    <%= form.label :lastname, Spree.t(:last_name) %><span class="required">*</span>
+    <%= form.text_field :lastname, :class => 'required form-control' %>
+  </div>
+  <% if Spree::Config[:company] %>
+    <div class="field form-group" id=<%="#{address_id}company" %>>
+      <%= form.label :company, Spree.t(:company) %>
+      <%= form.text_field :company, class: 'form-control' %>
+    </div>
+  <% end %>
+  <div class="field form-group" id=<%="#{address_id}address1" %>>
+    <%= form.label :address1, Spree.t(:street_address) %><span class="required">*</span>
+    <%= form.text_field :address1, :class => 'required form-control' %>
+  </div>
+  <div class="field form-group" id=<%="#{address_id}address2" %>>
+    <%= form.label :address2, Spree.t(:street_address_2) %>
+    <%= form.text_field :address2, class: 'form-control' %>
+  </div>
+  <div class="field form-group" id=<%="#{address_id}city" %>>
+    <%= form.label :city, Spree.t(:city) %><span class="required">*</span>
+    <%= form.text_field :city, :class => 'required form-control' %>
+  </div>
+  <div class="field form-group" id=<%="#{address_id}country" %>>
+    <%= form.label :country_id, Spree.t(:country) %><span class="required">*</span>
+    <span id=<%="#{address_id}country-selection" %>>
+      <%= form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required form-control'} %>
+    </span>
+  </div>
+
+  <% if Spree::Config[:address_requires_state] %>
+    <div class="field form-group" id=<%="#{address_id}state" %>>
+      <% have_states = !address.country.states.empty? %>
+      <%= form.label :state, Spree.t(:state) %><span class='required' id=<%="#{address_id}state-required"%>>*</span>
+
+      <% state_elements = [
+         form.collection_select(:state_id, address.country.states,
+                            :id, :name,
+                            {:include_blank => true},
+                            {:class => have_states ? 'required form-control' : 'hidden',
+                            :disabled => !have_states}) +
+         form.text_field(:state_name,
+                            :class => !have_states ? 'required form-control' : 'hidden',
+                            :disabled => have_states)
+         ].join.gsub('"', "'").gsub("\n", "")
+      %>
+      <%= javascript_tag do -%>
+        $('#<%="#{address_id}state" %>').append("<%== state_elements %>");
+      <% end %>
+    </div>
+      <noscript>
+        <%= form.text_field :state_name, :class => 'required form-control' %>
+      </noscript>
+  <% end %>
+
+  <div class="field form-group" id=<%="#{address_id}zipcode" %>>
+    <%= form.label :zipcode, Spree.t(:zip) %><% if address.require_zipcode? %><span class="required">*</span><% end %>
+    <%= form.text_field :zipcode, :class => "#{'required' if address.require_zipcode?} form-control" %>
+  </div>
+  <div class="field form-group" id=<%="#{address_id}phone" %>>
+    <%= form.label :phone, Spree.t(:phone) %><% if address.require_phone? %><span class="required">*</span><% end %>
+    <%= form.phone_field :phone, :class => "#{'required' if address.require_phone?} form-control" %>
+  </div>
+  <% if Spree::Config[:alternative_shipping_phone] %>
+    <div class="field form-group" id=<%="#{address_id}altphone" %>>
+      <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
+      <%= form.phone_field :alternative_phone, class: 'form-control' %>
+    </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/spree/checkout/_address.html.erb b/app/views/spree/checkout/_address.html.erb
new file mode 100644
index 0000000..92a52d9
--- /dev/null
+++ b/app/views/spree/checkout/_address.html.erb
@@ -0,0 +1,45 @@
+<div class='row'>
+  <div class="col-md-6" data-hook="billing_fieldset_wrapper">
+    <fieldset id="billing" data-hook>
+      <%= form.fields_for :bill_address do |bill_form| %>
+        <legend><%= Spree.t(:billing_address) %></legend>
+        <%= render :partial => 'spree/address/form', :locals => { :form => bill_form, :address_type => 'billing', :address => @order.bill_address } %>
+        <div class="field checkbox" data-hook="use_billing">
+          <%= label_tag :order_use_billing, :id => 'use_billing' do %>
+            <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
+            <%= Spree.t(:use_as_shipping_address) %>
+          <% end %>
+        </div>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <div class="col-md-6" data-hook="shipping_fieldset_wrapper">
+    <fieldset id="shipping" data-hook>
+      <%= form.fields_for :ship_address do |ship_form| %>
+        <legend><%= Spree.t(:shipping_address) %></legend>
+        <%= render :partial => 'spree/address/form', :locals => { :form => ship_form, :address_type => 'shipping', :address => @order.ship_address } %>
+      <% end %>
+    </fieldset>
+  </div>
+</div>
+<hr>
+<div class='row'>
+  <div class="form-buttons col-md-12" data-hook="buttons">
+    <div class='row'>
+      <div class='col-md-9'>
+      <% if try_spree_current_user %>
+        <div data-hook="save_user_address" class='checkbox'>
+          <%= label_tag :save_user_address do %>
+            <%= check_box_tag 'save_user_address', '1', try_spree_current_user.respond_to?(:persist_order_address) %>
+            <%= Spree.t(:save_my_address) %>
+          <% end %>
+        </div>
+      <% end %>
+      </div>
+      <div class='col-md-3'>
+        <%= submit_tag Spree.t(:save_and_continue), :class => 'continue btn btn-success btn-block' %>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/spree/checkout/_summary.html.erb b/app/views/spree/checkout/_summary.html.erb
new file mode 100644
index 0000000..f24c84c
--- /dev/null
+++ b/app/views/spree/checkout/_summary.html.erb
@@ -0,0 +1,72 @@
+<h3><%= Spree.t(:order_summary) %></h3>
+
+<table data-hook="order_summary" class='table'>
+  <tbody>
+    <tr data-hook="item_total">
+      <td><strong><%= Spree.t(:item_total) %>:</strong></td>
+      <td><strong><%= order.display_item_total.to_html %></strong></td>
+    </tr>
+
+    <% if order.line_item_adjustments.nonzero.exists? %>
+      <tbody data-hook="order_details_promotion_adjustments">
+        <% order.line_item_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+          <tr class="total">
+            <td><%= label %></td>
+            <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    <% end %>
+
+    <tbody data-hook="order_details_tax_adjustments">
+      <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+        <tr class="total">
+          <td><%= label %></td>
+          <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
+        </tr>
+      <% end %>
+    </tbody>
+
+    <% if order.passed_checkout_step?("delivery") && order.shipments.any? %>
+      <tr data-hook="shipping_total">
+        <td><%= Spree.t(:shipping_total) %>:</td>
+        <td><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
+      </tr>
+
+      <% if order.shipment_adjustments.nonzero.exists? %>
+        <tbody data-hook="order_details_shipment_promotion_adjustments">
+          <% order.shipment_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
+            <tr class="total">
+              <td><%= label %>:</td>
+              <td><%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      <% end %>
+    <% end %>
+
+    <% if order.adjustments.nonzero.eligible.exists? %>
+      <tbody id="summary-order-charges" data-hook>
+        <% order.adjustments.nonzero.eligible.each do |adjustment| %>
+        <% next if (adjustment.source_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
+          <tr class="total">
+            <td><%= adjustment.label %>:</td>
+            <td><%= adjustment.display_amount.to_html %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    <% end %>
+
+    <% if order.total_applicable_store_credit > 0.0 %>
+      <tr data-hook="checkout-summary-store-credit">
+        <td><%= Spree.t("store_credit.store_credit") %>:</td>
+        <td><%= order.display_total_applicable_store_credit.to_html %></td>
+      </tr>
+    <% end %>
+
+    <tr data-hook="order_total">
+      <td><strong><%= Spree.t(:order_total) %>:</strong></td>
+      <td><strong><span id='summary-order-total'><%= order.display_order_total_after_store_credit.to_html %></span></strong></td>
+    </tr>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/app/views/spree/checkout/edit.html.erb b/app/views/spree/checkout/edit.html.erb
index 5d041c7..a32f90c 100644
--- a/app/views/spree/checkout/edit.html.erb
+++ b/app/views/spree/checkout/edit.html.erb
@@ -2,24 +2,29 @@
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 
   <div class="row" data-hook="checkout_header">
-    <h1 class="columns three alpha" data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
-    <div class="columns thirteen omega" data-hook="checkout_progress"><%= checkout_progress %></div>
+    <div class='col-md-12'>
+      <h1 class="columns three alpha" data-hook="checkout_title"><%= Spree.t(:checkout) %></h1>
+      <div class="columns thirteen omega" data-hook="checkout_progress">
+        <%= checkout_progress %>  
+      </div>
+    </div>
   </div>
-
+  <hr>
   <div class="row" data-hook="checkout_content">
-    <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>" data-hook="checkout_form_wrapper">
+    <div class="<%= if @order.state != 'confirm' then 'col-md-9' else 'col-md-12' end %>" data-hook="checkout_form_wrapper">
       <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
         <% if @order.state == 'address' || !@order.email? %>
-          <p class="field" style='clear: both'>
-            <%= form.label :email %><br />
-            <%= form.text_field :email %>
-          </p>
+          <div class="field form-group" style='clear: both'>
+            <%= form.label :email %>
+            <%= form.text_field :email, class: 'form-control' %>
+          </div>
         <% end %>
+        <hr>
         <%= render @order.state, :form => form %>
       <% end %>
     </div>
     <% if @order.state != 'confirm' %>
-      <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
+      <div id="checkout-summary" data-hook="checkout_summary_box" class="col-md-3">
         <%= render :partial => 'summary', :locals => { :order => @order } %>
       </div>
     <% end %>
diff --git a/app/views/spree/checkout/registration.html.erb b/app/views/spree/checkout/registration.html.erb
index 8d880c2..38f4b9f 100644
--- a/app/views/spree/checkout/registration.html.erb
+++ b/app/views/spree/checkout/registration.html.erb
@@ -20,7 +20,7 @@
                 <%= Spree.t(:guest_user_account) %>    
               </div>
               <% if flash[:registration_error] %>
-                <div class='flash error'><%= flash[:registration_error] %></div>
+                <div class='flash alert alert-error'><%= flash[:registration_error] %></div>
               <% end %>
               <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
                 <div class='form-group'>
diff --git a/app/views/spree/shared/_error_messages.html.erb b/app/views/spree/shared/_error_messages.html.erb
new file mode 100644
index 0000000..5dfce79
--- /dev/null
+++ b/app/views/spree/shared/_error_messages.html.erb
@@ -0,0 +1,11 @@
+<% if target && target.errors.any? %>
+  <div id="errorExplanation" class="alert alert-error" data-hook>
+    <h2><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
+    <p><%= Spree.t(:there_were_problems_with_the_following_fields) %>:</p>
+     <ul>
+     <% target.errors.full_messages.each do |msg| %>
+       <li><%= msg %></li>
+     <% end %>
+     </ul>
+  </div>
+<% end %>
diff --git a/app/views/spree/shared/_footer.html.erb b/app/views/spree/shared/_footer.html.erb
index 7e2f897..b350ced 100644
--- a/app/views/spree/shared/_footer.html.erb
+++ b/app/views/spree/shared/_footer.html.erb
@@ -1,7 +1,8 @@
 <footer id="footer" class="row footer" data-hook>
+  <hr>
   <div id="footer-left" class="col-md-6" data-hook>
     <div>
-      <%= Spree.t :powered_by  %> <%= link_to 'Solidus', 'http://solidus.io/' %>
+      <%= Spree.t :powered_by  %> <%= link_to 'Codemy.net', 'http://www.codemy.net/' %>
     </div>
   </div>
   <div id="footer-right" class="col-md-6" data-hook></div>