Password & token split up, icon to button for top panel

app/views/profile/password.html.haml

@@ -1,50 +1,20 @@
-.row
-  .span6
-    .thumbnail
-      .caption
-        %h3 Password
-        %hr
-        = form_for @user, :url => profile_password_path, :method => :put do |f|
-          .data
-            .alert.alert-info
-              %p After successful password update you will be redirected to login page where you should login with new password
-            -if @user.errors.any?
-              .alert-message.block-message.error
-                %ul
-                  - @user.errors.full_messages.each do |msg|
-                    %li= msg
-
-            .clearfix
-              = f.label :password
-              .input= f.password_field :password
-            .clearfix
-              = f.label :password_confirmation
-              .input= f.password_field :password_confirmation
-          %hr
-            = f.submit 'Save', :class => "btn"
-
-  .span6.right
-    .thumbnail
-      .caption
-        %h3 
-          Private token
-          %span.cred.right
-            keep it in secret!
-        %hr
-        = form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
-          .data
-            .alert.alert-info
-              %p Private token used to access application resources without authentication.
-              %hr
-              %p * required for rss feed
-            %p.cgray
-              - if current_user.private_token
-                = text_field_tag "token", current_user.private_token
-              - else
-                You don`t have one yet. Click generate to fix it.
-          %hr
-            - if current_user.private_token
-              = f.submit 'Reset', :confirm => "Are you sure?", :class => "btn"
-            - else
-              = f.submit 'Generate', :class => "btn"
+%h3 Password
+%hr
+= form_for @user, :url => profile_password_path, :method => :put do |f|
+  .data
+    .alert.alert-info
+      %span After successful password update you will be redirected to login page where you should login with new password
+    -if @user.errors.any?
+      .alert-message.block-message.error
+        %ul
+          - @user.errors.full_messages.each do |msg|
+            %li= msg
 
+    .clearfix
+      = f.label :password
+      .input= f.password_field :password
+    .clearfix
+      = f.label :password_confirmation
+      .input= f.password_field :password_confirmation
+  .actions
+    = f.submit 'Save', :class => "btn primary"

app/views/profile/token.html.haml

@@ -0,0 +1,22 @@
+%h3 
+  Private token
+  %span.cred.right
+    keep it in secret!
+%hr
+= form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
+  .data
+    .alert.alert-info
+      %p Private token used to access application resources without authentication.
+      %p * required for rss feed
+    %p.cgray
+      - if current_user.private_token
+        = text_field_tag "token", current_user.private_token
+      - else
+        You don`t have one yet. Click generate to fix it.
+  .actions
+    - if current_user.private_token
+      = f.submit 'Reset', :confirm => "Are you sure?", :class => "btn"
+    - else
+      = f.submit 'Generate', :class => "btn primary"
+
+