diff --git a/app/views/fluentd/_form.html.haml b/app/views/fluentd/_form.html.haml
index e21cb6b..51854f9 100644
--- a/app/views/fluentd/_form.html.haml
+++ b/app/views/fluentd/_form.html.haml
@@ -1,27 +1,27 @@
-%div.col-xs-6
+.col-xs-6
   - @fluentd.errors.full_messages.each do |e|
-    %div.alert.alert-danger= e
+    .alert.alert-danger= e
 
   = form_for(:fluentd, url: url, method: method) do |f|
-    %div.form-group
+    .form-group
       = f.label :variant
       = f.hidden_field :variant
       = @fluentd.variant
-    %div.form-group
+    .form-group
       = f.label :pid_file
       - if @fluentd.td_agent?
         = f.text_field :pid_file, class: "form-control", disabled: true
         = f.hidden_field :pid_file
       - else
         = f.text_field :pid_file, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :log_file
       - if @fluentd.td_agent?
         = f.text_field :log_file, class: "form-control", disabled: true
         = f.hidden_field :log_file
       - else
         = f.text_field :log_file, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :config_file
       - if @fluentd.td_agent?
         = f.text_field :config_file, class: "form-control", disabled: true
diff --git a/app/views/fluentd/errors.html.haml b/app/views/fluentd/errors.html.haml
index adfb609..425d30a 100644
--- a/app/views/fluentd/errors.html.haml
+++ b/app/views/fluentd/errors.html.haml
@@ -3,14 +3,14 @@
     = icon('fa-download')
     = t('fluentd.common.raw_log_link')
 
-%div.row
-  %div.col-xs-12
+.row
+  .col-xs-12
     - @errors.each do |error|
-      %div.panel.panel-default
-        %div.panel-heading
+      .panel.panel-default
+        .panel-heading
           %h4= error[:subject]
         - if error[:notes].present?
-          %div.panel-body
+          .panel-body
             %ul
               - error[:notes].each do |stack|
                 %li= stack
diff --git a/app/views/fluentd/settings/_form.html.haml b/app/views/fluentd/settings/_form.html.haml
index 8e1c488..237cbfc 100644
--- a/app/views/fluentd/settings/_form.html.haml
+++ b/app/views/fluentd/settings/_form.html.haml
@@ -1,12 +1,12 @@
 
 - @setting.errors.full_messages.each do |e|
-  %div.alert.alert-danger= e
+  .alert.alert-danger= e
 
-%div.form-group
+.form-group
   = f.label :path
   = f.hidden_field :path
   = f.text_field :path, class: "form-control", disabled: true
-%div.form-group
+.form-group
   = f.label :format
   = f.hidden_field :format
   = f.text_field :format, class: "form-control", disabled: true
@@ -20,10 +20,10 @@
   %label= @setting.format
   = f.hidden_field :regexp
   = @setting.regexp
-%div.form-group
+.form-group
   = f.label :tag
   = f.text_field :tag, class: "form-control"
-%div.form-group
+.form-group
   = f.label :pos_file
   = f.text_field :pos_file, class: "form-control"
 .well.well-sm
@@ -31,13 +31,13 @@
     = icon('fa-caret-down')
     = t('terms.advanced_setting')
   #advanced-setting.collapse
-    %div.form-group
+    .form-group
       = f.label :rotate_wait
       = f.text_field :rotate_wait, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :read_from_head
       = f.check_box :read_from_head, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :refresh_interval
       = f.text_field :refresh_interval, class: "form-control"
 
diff --git a/app/views/fluentd/settings/edit.html.haml b/app/views/fluentd/settings/edit.html.haml
index f431d17..382ee5a 100644
--- a/app/views/fluentd/settings/edit.html.haml
+++ b/app/views/fluentd/settings/edit.html.haml
@@ -1,7 +1,7 @@
 - page_title t('.page_title', label: @fluentd.label)
 
 = form_tag(daemon_setting_path(@fluentd), method: :patch) do
-  %div.form-group
+  .form-group
     = text_area_tag "config", @config, class: "form-control", rows: 40
   %p.text.text-danger= t('terms.notice_restart_for_config_edit', brand: fluentd_ui_brand)
   = submit_tag t("terms.update"), class: "btn btn-primary"
diff --git a/app/views/fluentd/settings/in_tail/_form.html.haml b/app/views/fluentd/settings/in_tail/_form.html.haml
index 3e06dd6..733534b 100644
--- a/app/views/fluentd/settings/in_tail/_form.html.haml
+++ b/app/views/fluentd/settings/in_tail/_form.html.haml
@@ -1,11 +1,11 @@
 - @setting.errors.full_messages.each do |e|
-  %div.alert.alert-danger= e
+  .alert.alert-danger= e
 
-%div.form-group
+.form-group
   = f.label :path
   = f.hidden_field :path
   = f.text_field :path, class: "form-control", disabled: true
-%div.form-group
+.form-group
   = f.label :format
   = f.hidden_field :format
   = f.text_field :format, class: "form-control", disabled: true
@@ -19,10 +19,10 @@
   %label= @setting.format
   = f.hidden_field :regexp
   = @setting.regexp
-%div.form-group
+.form-group
   = f.label :tag
   = f.text_field :tag, class: "form-control"
-%div.form-group
+.form-group
   = f.label :pos_file
   = f.text_field :pos_file, class: "form-control"
 .well.well-sm
@@ -30,13 +30,13 @@
     = icon('fa-caret-down')
     = t('terms.advanced_setting')
   #advanced-setting.collapse
-    %div.form-group
+    .form-group
       = f.label :rotate_wait
       = f.text_field :rotate_wait, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :read_from_head
       = f.check_box :read_from_head, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :refresh_interval
       = f.text_field :refresh_interval, class: "form-control"
 
diff --git a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
index 5c1281f..79da579 100644
--- a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
+++ b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
@@ -4,9 +4,9 @@
 
 = form_for(@setting, as: "setting", url: after_format_daemon_setting_in_tail_path(@fluentd)) do |f|
   - @setting.errors.full_messages.each do |e|
-    %div.alert.alert-danger= e
+    .alert.alert-danger= e
 
-  %div.form-group
+  .form-group
     = f.label :path
     = f.hidden_field :path
     = f.text_field :path, class: "form-control", disabled: true
diff --git a/app/views/fluentd/show.html.haml b/app/views/fluentd/show.html.haml
index 2bdacbf..10b8fb7 100644
--- a/app/views/fluentd/show.html.haml
+++ b/app/views/fluentd/show.html.haml
@@ -13,7 +13,7 @@
               = t("fluentd.common.stopped")
         .panel-body
           - if flash[:error]
-            %div.alert.alert-danger= flash[:error]
+            .alert.alert-danger= flash[:error]
           = link_to icon("fa-play") << t("fluentd.common.start"), start_daemon_agent_path(@fluentd),     method: :put, class: "btn #{@fluentd.agent.running? ? "disabled btn-default" : "btn-primary"}"
           = link_to icon("fa-pause") << t("fluentd.common.stop"), stop_daemon_agent_path(@fluentd),       method: :put, class: "btn #{@fluentd.agent.running? ? "btn-danger" : "disabled btn-default"}"
           = link_to icon("fa-refresh") << t("fluentd.common.restart"), restart_daemon_agent_path(@fluentd), method: :put, class: "btn #{@fluentd.agent.running? ? "btn-warning" : "disabled btn-default"}"
diff --git a/app/views/misc/information.html.haml b/app/views/misc/information.html.haml
index 78568e3..9b7162f 100644
--- a/app/views/misc/information.html.haml
+++ b/app/views/misc/information.html.haml
@@ -12,11 +12,11 @@
         = t('.update_fluentd_ui_caution', brand: fluentd_ui_brand)
 
 .row
-  %div.col-xs-6
-    %div.panel.panel-default
-      %div.panel-heading
+  .col-xs-6
+    .panel.panel-default
+      .panel-heading
         %h4= t("terms.version")
-      %div.panel-body
+      .panel-body
         %dl{class: "dl-horizontal"}
           %dt ruby
           %dd= RUBY_DESCRIPTION
@@ -26,11 +26,11 @@
           %dt fluentd-ui
           %dd= FluentdUI::VERSION
 
-  %div.col-xs-6
-    %div.panel.panel-default
-      %div.panel-heading
+  .col-xs-6
+    .panel.panel-default
+      .panel-heading
         %h4= t('terms.installed_plugins')
-      %div.panel-body
+      .panel-body
         - if @plugins.present?
           %table{class: "table table-hover", id: "plugins-table"}
             %thead
@@ -46,9 +46,9 @@
           = t "plugins.common.no_installed"
 
 .row
-  %div.col-xs-12
-    %div.panel.panel-default
-      %div.panel-heading
+  .col-xs-12
+    .panel.panel-default
+      .panel-heading
         %h4{"data-toggle" => "collapse", "href" => "#env-table"}
           = icon('fa-caret-down')
           = t('.env')
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index de37679..cf88f58 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -5,9 +5,9 @@
   .panel-body
     = render partial: "shared/error"
     = form_for(:session, url: sessions_path) do |f|
-      %div.form-group
+      .form-group
         = f.text_field :name, placeholder: t('terms.name')
-      %div.form-group
+      .form-group
         = f.password_field :password, placeholder: t('terms.password')
 
       = submit_tag t("terms.sign_in"), class: "btn btn-success"
diff --git a/app/views/shared/_fluentd_nav.html.haml b/app/views/shared/_fluentd_nav.html.haml
index 9e838c0..7fcaafb 100644
--- a/app/views/shared/_fluentd_nav.html.haml
+++ b/app/views/shared/_fluentd_nav.html.haml
@@ -2,7 +2,7 @@
   = @fluentd.agent.running? ? t("fluentd.common.running") : t("fluentd.common.stopped")
 
 - if flash[:error]
-  %div.alert.alert-danger= flash[:error]
+  .alert.alert-danger= flash[:error]
 
 = link_to t("fluentd.common.detail"), daemon_path(@fluentd)
 = link_to t("fluentd.common.start"), start_daemon_agent_path(@fluentd), method: :put
diff --git a/app/views/shared/_initial_setup.html.haml b/app/views/shared/_initial_setup.html.haml
index 6e79421..c4a0c69 100644
--- a/app/views/shared/_initial_setup.html.haml
+++ b/app/views/shared/_initial_setup.html.haml
@@ -1,11 +1,11 @@
 - page_title "fluentd"
 
-%div.row
-  %div.col-xs-6
-    %div.well
+.row
+  .col-xs-6
+    .well
       %span= link_to icon("fa-cog") << t("terms.setup", target: "fluentd"), new_daemon_path(variant: "fluentd_gem"), class: "btn btn-primary btn-lg"
-  %div.col-xs-6
-    %div.well
+  .col-xs-6
+    .well
       %span
         = link_to icon("fa-cog") << t("terms.setup", target: "td-agent"), new_daemon_path(variant: "td-agent"), class: "btn btn-lg #{has_td_agent_system? ? "btn-primary" : "btn-default disabled"}"
         - unless has_td_agent_system?
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 026e35d..ddb0ae0 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -2,24 +2,24 @@
 
 
 
-%div.col-xs-6
+.col-xs-6
   - if notice
-    %div.alert.alert-success= notice
+    .alert.alert-success= notice
   - else
     - @user.errors.full_messages.each do |e|
-      %div.alert.alert-danger= e
+      .alert.alert-danger= e
 
   = form_for(:user, url: user_path, method: :patch) do |f|
-    %div.form-group
+    .form-group
       = f.label :name
       = f.text_field :name, class: "form-control", disabled: true
-    %div.form-group
+    .form-group
       = f.label :current_password
       = f.password_field :current_password, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :password
       = f.password_field :password, class: "form-control"
-    %div.form-group
+    .form-group
       = f.label :password_confirmation
       = f.password_field :password_confirmation, class: "form-control"
     = f.submit t("terms.update_password"), class: "btn btn-primary"