Basic site flow improvements and devise handling

app/views/suppliers/passwords/edit.html.slim

@@ -2,13 +2,11 @@ h2= t('devise.passwords.edit.title')
 = form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal', method: :put}) do |f| 
   = devise_error_messages!
   = f.hidden_field :reset_password_token
-  .control-group
-     = f.label :password, class: 'control-label'
-     .controls= f.password_field :password
-  .control-group
-     = f.label :password_confirmation, class: 'control-label'
-     .controls= f.password_field :password_confirmation
-  .control-group
-    .controls
-      = f.submit t('devise.passwords.edit.button'), class: 'btn btn-primary'
+  .form-row
+    .form-label= f.label :password
+    .form-field= f.password_field :password
+  = f.row :password_confirmation do
+    .form-label= f.label :password_confirmation
+    .form-field= f.password_field :password_confirmation
+  .form-row= f.submit t('devise.passwords.edit.button'), class: 'button'
 = render "links"

app/views/suppliers/passwords/new.html.slim

@@ -1,10 +1,8 @@
 h2= t('devise.passwords.title')
 = form_for(resource, :as => resource_name, :url => password_path(resource_name), html: {class: 'form-horizontal'}) do |f| 
   = devise_error_messages!
-  .control-group
-     = f.label :email, class: 'control-label'
-     .controls= f.email_field :email
-  .control-group
-    .controls
-      = f.submit t('devise.passwords.button'), class: 'btn btn-primary'
+  = f.row :email do
+    .form-label= f.label :email, class: 'control-label'
+    .form-field= f.email_field :email
+  .form-row.form-actions= f.submit t('devise.passwords.button'), class: 'button'
 = render "links"