diff --git a/app/views/messenger_settings/_show.html.slim b/app/views/messenger_settings/_show.html.slim
index c8ba65d..9e7f8d7 100644
--- a/app/views/messenger_settings/_show.html.slim
+++ b/app/views/messenger_settings/_show.html.slim
@@ -1,12 +1,17 @@
-.box.tabular.messenger_settings
-  - @messenger_setting = MessengerSetting.find_or_create(@project.id)
-  = labelled_form_for :setting,
-                      @messenger_setting,
-                      url: project_messenger_setting_path(project_id: @project),
-                      method: :put,
-                      class: 'tabular' do |f|
-    = error_messages_for 'messenger_setting'
-    .box
+= error_messages_for 'messenger_setting'
+
+- @messenger_setting = MessengerSetting.find_or_create(@project.id)
+= labelled_form_for :setting,
+                    @messenger_setting,
+                    url: project_messenger_setting_path(project_id: @project),
+                    method: :put,
+                    class: 'tabular' do |f|
+
+  fieldset#messenger_settings.box.tabular
+    - if User.current.admin?
+      .contextual
+        = link_to l(:label_administration), plugin_settings_path(id: 'redmine_messenger'), class: 'icon icon-settings'
+
       .info = t(:messenger_settings_project_intro)
       br
       p
@@ -21,50 +26,50 @@
       = render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_username, size: 30 }
       = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_verify_ssl }
 
+  fieldset#messenger_settings.box.tabular
+    legend = l(:label_issue_plural)
+    .info = t(:messenger_issue_intro)
+    br
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :auto_mentions }
+    = render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :default_mentions, size: 30 }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :display_watchers }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_updates }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :new_include_description }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :updated_include_description }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_issues }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_notes }
+
+  fieldset#messenger_settings.box.tabular
+    legend = l(:label_wiki)
+    .info = t(:messenger_wiki_intro)
+    br
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki_updates }
+
+  - if RedmineMessenger::REDMINE_DB_SUPPORT && User.current.allowed_to?(:view_db_entries, @project)
+    fieldset#messenger_settings.box.tabular
+      legend = l(:label_db_entry_plural)
+      .info = t(:messenger_db_intro)
       br
-      h3 = l(:label_issue_plural)
-      .info = t(:messenger_issue_intro)
+      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db }
+      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db_updates }
+      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_db }
+
+  - if RedmineMessenger::REDMINE_CONTACTS_SUPPORT && User.current.allowed_to?(:view_contacts, @project)
+    fieldset#messenger_settings.box.tabular
+      legend = l(:label_contact_plural)
+      .info = t(:messenger_contacts_intro)
       br
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :auto_mentions }
-      = render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :default_mentions, size: 30 }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :display_watchers }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_updates }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :new_include_description }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :updated_include_description }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_issues }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_notes }
+      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact }
+      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact_updates }
+      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_contacts }
 
-      br
-      h3 = l(:label_wiki)
-      .info = t(:messenger_wiki_intro)
-      br
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki }
-      = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki_updates }
+  - if Redmine::Plugin.installed?('redmine_passwords') && User.current.allowed_to?(:view_passwords, @project)
+    fieldset#messenger_settings.box.tabular
+    legend = l(:label_settings_post_password)
+    .info = t(:messenger_passwords_intro)
+    br
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password }
+    = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password_updates }
 
-      - if RedmineMessenger::REDMINE_DB_SUPPORT && User.current.allowed_to?(:view_db_entries, @project)
-        br
-        h3 = l(:label_db_entry_plural)
-        .info = t(:messenger_db_intro)
-        br
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db }
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db_updates }
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_db }
-
-      - if RedmineMessenger::REDMINE_CONTACTS_SUPPORT && User.current.allowed_to?(:view_contacts, @project)
-        br
-        h3 = l(:label_contact_plural)
-        .info = t(:messenger_contacts_intro)
-        br
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact }
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact_updates }
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_contacts }
-
-      - if Redmine::Plugin.installed?('redmine_passwords') && User.current.allowed_to?(:view_passwords, @project)
-        br
-        h3 = l(:label_settings_post_password)
-        .info = t(:messenger_passwords_intro)
-        br
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password }
-        = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password_updates }
-
-    = submit_tag l(:button_save)
+  = submit_tag l(:button_save)
diff --git a/app/views/settings/_messenger_settings.html.slim b/app/views/settings/_messenger_settings.html.slim
index 0e1a31a..6742cab 100644
--- a/app/views/settings/_messenger_settings.html.slim
+++ b/app/views/settings/_messenger_settings.html.slim
@@ -1,105 +1,105 @@
-- @settings = ActionController::Parameters.new(@settings) unless Rails.version >= '5.2'
-
 .info = t(:messenger_settings_intro)
 br
-p
-  = content_tag(:label, l(:label_settings_messenger_url))
-  = text_field_tag('settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://webhook.url')
-  em.info = t(:messenger_url_info_html)
-p
-  = content_tag(:label, l(:label_settings_messenger_icon))
-  = text_field_tag('settings[messenger_icon]', @settings[:messenger_icon], size: 60)
-p
-  = content_tag(:label, l(:label_settings_messenger_channel))
-  = text_field_tag('settings[messenger_channel]', @settings[:messenger_channel], size: 30, placeholder: 'redmine')
-  em.info = t(:messenger_channel_info_html)
-p
-  = content_tag(:label, l(:label_settings_messenger_username))
-  = text_field_tag('settings[messenger_username]', @settings[:messenger_username], size: 30)
-p
-  = content_tag(:label, l(:label_settings_messenger_verify_ssl))
-  = check_box_tag 'settings[messenger_verify_ssl]', 1, @settings[:messenger_verify_ssl].to_i == 1
-  em.info = t(:messenger_verify_ssl_info_html)
 
-br
-h3 = l(:label_issue_plural)
-.info = t(:messenger_issue_intro)
-br
-p
-  = content_tag(:label, l(:label_settings_auto_mentions))
-  = check_box_tag 'settings[auto_mentions]', 1, @settings[:auto_mentions].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_default_mentions))
-  = text_field_tag('settings[default_mentions]', @settings[:default_mentions], size: 30)
-  em.info = t(:default_mentionsl_info)
-p
-  = content_tag(:label, l(:label_settings_display_watchers))
-  = check_box_tag 'settings[display_watchers]', 1, @settings[:display_watchers].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_post_updates))
-  = check_box_tag 'settings[post_updates]', 1, @settings[:post_updates].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_new_include_description))
-  = check_box_tag 'settings[new_include_description]', 1, @settings[:new_include_description].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_updated_include_description))
-  = check_box_tag 'settings[updated_include_description]', 1, @settings[:updated_include_description].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_post_private_issues))
-  = check_box_tag 'settings[post_private_issues]', 1, @settings[:post_private_issues].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_post_private_notes))
-  = check_box_tag 'settings[post_private_notes]', 1, @settings[:post_private_notes].to_i == 1
+fieldset#messenger_settings.box.tabular
+  p
+    = content_tag(:label, l(:label_settings_messenger_url))
+    = text_field_tag('settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://webhook.url')
+    em.info = t(:messenger_url_info_html)
+  p
+    = content_tag(:label, l(:label_settings_messenger_icon))
+    = text_field_tag('settings[messenger_icon]', @settings[:messenger_icon], size: 60)
+  p
+    = content_tag(:label, l(:label_settings_messenger_channel))
+    = text_field_tag('settings[messenger_channel]', @settings[:messenger_channel], size: 30, placeholder: 'redmine')
+    em.info = t(:messenger_channel_info_html)
+  p
+    = content_tag(:label, l(:label_settings_messenger_username))
+    = text_field_tag('settings[messenger_username]', @settings[:messenger_username], size: 30)
+  p
+    = content_tag(:label, l(:label_settings_messenger_verify_ssl))
+    = check_box_tag 'settings[messenger_verify_ssl]', 1, @settings[:messenger_verify_ssl].to_i == 1
+    em.info = t(:messenger_verify_ssl_info_html)
 
-br
-h3 = l(:label_wiki)
-.info = t(:messenger_wiki_intro)
-br
-p
-  = content_tag(:label, l(:label_settings_post_wiki))
-  = check_box_tag 'settings[post_wiki]', 1, @settings[:post_wiki].to_i == 1
-p
-  = content_tag(:label, l(:label_settings_post_wiki_updates))
-  = check_box_tag 'settings[post_wiki_updates]', 1, @settings[:post_wiki_updates].to_i == 1
+fieldset#messenger_settings.box.tabular
+  legend = l(:label_issue_plural)
+  .info = t(:messenger_issue_intro)
+  br
+  p
+    = content_tag(:label, l(:label_settings_auto_mentions))
+    = check_box_tag 'settings[auto_mentions]', 1, @settings[:auto_mentions].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_default_mentions))
+    = text_field_tag('settings[default_mentions]', @settings[:default_mentions], size: 30)
+    em.info = t(:default_mentionsl_info)
+  p
+    = content_tag(:label, l(:label_settings_display_watchers))
+    = check_box_tag 'settings[display_watchers]', 1, @settings[:display_watchers].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_post_updates))
+    = check_box_tag 'settings[post_updates]', 1, @settings[:post_updates].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_new_include_description))
+    = check_box_tag 'settings[new_include_description]', 1, @settings[:new_include_description].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_updated_include_description))
+    = check_box_tag 'settings[updated_include_description]', 1, @settings[:updated_include_description].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_post_private_issues))
+    = check_box_tag 'settings[post_private_issues]', 1, @settings[:post_private_issues].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_post_private_notes))
+    = check_box_tag 'settings[post_private_notes]', 1, @settings[:post_private_notes].to_i == 1
+
+fieldset#messenger_settings.box.tabular
+  legend = l(:label_wiki)
+  .info = t(:messenger_wiki_intro)
+  br
+  p
+    = content_tag(:label, l(:label_settings_post_wiki))
+    = check_box_tag 'settings[post_wiki]', 1, @settings[:post_wiki].to_i == 1
+  p
+    = content_tag(:label, l(:label_settings_post_wiki_updates))
+    = check_box_tag 'settings[post_wiki_updates]', 1, @settings[:post_wiki_updates].to_i == 1
 
 - if RedmineMessenger::REDMINE_DB_SUPPORT
-  br
-  h3 = l(:label_db_entry_plural)
-  .info = t(:messenger_db_intro)
-  br
-  p
-    = content_tag(:label, l(:label_settings_post_db))
-    = check_box_tag 'settings[post_db]', 1, @settings[:post_db].to_i == 1
-  p
-    = content_tag(:label, l(:label_settings_post_db_updates))
-    = check_box_tag 'settings[post_db_updates]', 1, @settings[:post_db_updates].to_i == 1
-  p
-    = content_tag(:label, l(:label_settings_post_private_db))
-    = check_box_tag 'settings[post_private_db]', 1, @settings[:post_private_db].to_i == 1
+  fieldset#messenger_settings.box.tabular
+    legend = l(:label_db_entry_plural)
+    .info = t(:messenger_db_intro)
+    br
+    p
+      = content_tag(:label, l(:label_settings_post_db))
+      = check_box_tag 'settings[post_db]', 1, @settings[:post_db].to_i == 1
+    p
+      = content_tag(:label, l(:label_settings_post_db_updates))
+      = check_box_tag 'settings[post_db_updates]', 1, @settings[:post_db_updates].to_i == 1
+    p
+      = content_tag(:label, l(:label_settings_post_private_db))
+      = check_box_tag 'settings[post_private_db]', 1, @settings[:post_private_db].to_i == 1
 
 - if RedmineMessenger::REDMINE_CONTACTS_SUPPORT
-  br
-  h3 = l(:label_contact_plural)
-  .info = t(:messenger_contacts_intro)
-  br
-  p
-    = content_tag(:label, l(:label_settings_post_contact))
-    = check_box_tag 'settings[post_contact]', 1, @settings[:post_contact].to_i == 1
-  p
-    = content_tag(:label, l(:label_settings_post_contact_updates))
-    = check_box_tag 'settings[post_contact_updates]', 1, @settings[:post_contact_updates].to_i == 1
-  p
-    = content_tag(:label, l(:label_settings_post_private_contacts))
-    = check_box_tag 'settings[post_private_contacts]', 1, @settings[:post_private_contacts].to_i == 1
+  fieldset#messenger_settings.box.tabular
+    legend = l(:label_contact_plural)
+    .info = t(:messenger_contacts_intro)
+    br
+    p
+      = content_tag(:label, l(:label_settings_post_contact))
+      = check_box_tag 'settings[post_contact]', 1, @settings[:post_contact].to_i == 1
+    p
+      = content_tag(:label, l(:label_settings_post_contact_updates))
+      = check_box_tag 'settings[post_contact_updates]', 1, @settings[:post_contact_updates].to_i == 1
+    p
+      = content_tag(:label, l(:label_settings_post_private_contacts))
+      = check_box_tag 'settings[post_private_contacts]', 1, @settings[:post_private_contacts].to_i == 1
 
 - if Redmine::Plugin.installed?('redmine_passwords')
-  br
-  h3 = l(:label_password_plural)
-  .info = t(:messenger_passwords_intro)
-  br
-  p
-    = content_tag(:label, l(:label_settings_post_password))
-    = check_box_tag 'settings[post_password]', 1, @settings[:post_password].to_i == 1
-  p
-    = content_tag(:label, l(:label_settings_post_password_updates))
-    = check_box_tag 'settings[post_password_updates]', 1, @settings[:post_password_updates].to_i == 1
+  fieldset#messenger_settings.box.tabular
+    legend = l(:label_password_plural)
+    .info = t(:messenger_passwords_intro)
+    br
+    p
+      = content_tag(:label, l(:label_settings_post_password))
+      = check_box_tag 'settings[post_password]', 1, @settings[:post_password].to_i == 1
+    p
+      = content_tag(:label, l(:label_settings_post_password_updates))
+      = check_box_tag 'settings[post_password_updates]', 1, @settings[:post_password_updates].to_i == 1