diff --git a/Gemfile b/Gemfile
index 4ac77c02..7ad3e083 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :development do
   gem 'spring'
   gem 'spring-commands-rspec'
   gem 'web-console', '~> 2.0.0.beta3'
-  
+
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 426c4f67..e8a58088 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/plataformatec/devise.git
-  revision: c25312e78ec413f2edb0f50bc03e3472c328d862
+  revision: ce6e369ba85d3759474e468dd0b28735e7450a3d
   branch: lm-rails-4-2
   specs:
     devise (3.3.0)
@@ -159,7 +159,7 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     email_validator (1.4.0)
       activemodel
-    ember-data-source (1.0.0.beta.9)
+    ember-data-source (1.0.0.beta.10)
       ember-source
     ember-rails (0.15.0)
       active_model_serializers
@@ -199,7 +199,7 @@ GEM
       websocket-driver (>= 0.3.1)
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    foundation-rails (5.4.3.0)
+    foundation-rails (5.4.3.1)
       railties (>= 3.1.0)
       sass (>= 3.2.0)
     fuubar (2.0.0)
@@ -207,7 +207,7 @@ GEM
       ruby-progressbar (~> 1.4)
     gherkin (2.12.2)
       multi_json (~> 1.3)
-    globalid (0.2.3)
+    globalid (0.3.0)
       activesupport (>= 4.1.0)
     haml (4.0.5)
       tilt
@@ -243,7 +243,7 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_magick (3.8.0)
+    mini_magick (3.8.1)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
     minitest (5.4.1)
@@ -312,7 +312,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    rdoc (4.1.1)
+    rdoc (4.1.2)
       json (~> 1.4)
     responders (2.0.0)
       railties (>= 4.2.0.alpha, < 5)
@@ -324,7 +324,7 @@ GEM
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.1)
+    rspec-core (3.1.2)
       rspec-support (~> 3.1.0)
     rspec-expectations (3.1.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -344,7 +344,7 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.0)
     ruby-progressbar (1.5.1)
-    sass (3.4.3)
+    sass (3.4.4)
     sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2)
@@ -394,9 +394,9 @@ GEM
     tilt (1.4.1)
     tinymce-rails (4.1.4)
       railties (>= 3.1.1)
-    turnip (1.2.2)
+    turnip (1.2.3)
       gherkin (>= 2.5)
-      rspec (>= 2.0, < 4.0)
+      rspec (>= 2.14.0, < 4.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.3)
diff --git a/app/assets/stylesheets/supplier/foundation1/components/_forms.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_forms.css.sass
index 3dd2e783..fc5d4e4f 100644
--- a/app/assets/stylesheets/supplier/foundation1/components/_forms.css.sass
+++ b/app/assets/stylesheets/supplier/foundation1/components/_forms.css.sass
@@ -1,5 +1,5 @@
 .form-row
-  @extend .row
+  +grid-row
   .form-label
     @media #{$small-only}
       +grid-column($columns:10, $center:true)