diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb
index 3e27e67..316a0e7 100644
--- a/app/views/users/registrations/edit.html.erb
+++ b/app/views/users/registrations/edit.html.erb
@@ -1,15 +1,16 @@
 <div class="leftside">
 <% content_for :navigation, flush: true do %>
-    <%= image_link_to t(:back), 'arrow-left-bold-outline',
-      request.referer.present? ? :back : root_url %>
+  <%= image_link_to t(:back), 'arrow-left-bold-outline',
+    request.referer.present? ? :back : root_path %>
 <% end %>
+
+<div class="rightside buttongrid">
+  <%= image_button_to t(".delete"), "account-remove-outline", user_registration_path,
+    method: :delete, form_class: 'tools', onclick: {confirm: t(".confirm_delete")} %>
 </div>
-<div class="rightside">
-    <%= image_button_to t(".delete"), "account-remove-outline", user_registration_path,
-       method: :delete, :class => "extendedleft", onclick: {confirm: t(".confirm_delete")} %>
-</div>
-<div class="main">
-  <%= labelled_form_for resource, url: registration_path(resource), html: {method: :patch} do |f| %>
+
+<%= labelled_form_for resource, url: registration_path(resource),
+                      html: {method: :patch, class: 'main'} do |f| %>
   <%= f.email_field :email, size: 30, autofocus: true, autocomplete: "off" %>
   <% if f.object.pending_reconfirmation? %>
   <%= f.text_field :unconfirmed_email, readonly: true, tabindex: -1,
@@ -20,9 +21,9 @@
   <%= f.select :status, User.statuses, readonly: true %>
 
   <%= f.password_field :password, label: t(".new_password"), size: 30,
-        minlength: @minimum_password_length, autocomplete: "new-password",
-        hint: t(".blank_password_hint").html_safe + ("<br>").html_safe +  
-              t("users.minimum_password_length", count: @minimum_password_length) %>
+    minlength: @minimum_password_length, autocomplete: "new-password",
+    hint: t(".blank_password_hint_html",
+            subhint: t("users.minimum_password_length", count: @minimum_password_length)) %>
   <%= f.password_field :password_confirmation, label: t(".password_confirmation"),
         size: 30, minlength: @minimum_password_length, autocomplete: "off" %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 779a682..06f86ef 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -85,7 +85,7 @@ en:
         unconfirmed_email_hint: (since %{timestamp})
         new_password: New password
         password_confirmation: Retype new password
-        blank_password_hint: leave blank to keep unchanged
+        blank_password_hint_html: leave blank to keep unchanged<br>%{subhint}
         update: Update profile
     sessions:
       new: