diff --git a/_includes/head.html b/_includes/head.html
index 1dfe049..62d3e29 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -62,13 +62,8 @@
 
   {% include css-selector.html %}
 
-  <!-- JavaScripts -->
+  <!-- JavaScript -->
 
   <script src="https://cdn.jsdelivr.net/npm/jquery@3/dist/jquery.min.js"></script>
 
-  <script defer
-    src="https://cdn.jsdelivr.net/combine/npm/popper.js@1.15.0,npm/bootstrap@4/dist/js/bootstrap.min.js"></script>
-
-  {% include js-selector.html %}
-
 </head>
diff --git a/_includes/js-selector.html b/_includes/js-selector.html
index 42336bc..ff2f295 100644
--- a/_includes/js-selector.html
+++ b/_includes/js-selector.html
@@ -2,18 +2,34 @@
   JS selector for site.
 -->
 
+<!-- common -->
+
+<script async src="https://cdn.jsdelivr.net/combine/npm/popper.js@1.15.0,npm/bootstrap@4/dist/js/bootstrap.min.js"></script>
+
+{% if jekyll.environment == 'production' %}
+  <!-- PWA -->
+  <script defer src="{{ '/app.js' | relative_url }}"></script>
+
+  <!-- GA -->
+  {% if site.google_analytics.id %}
+    {% include google-analytics.html %}
+  {% endif %}
+
+{% endif %}
+
+<!-- layout specified -->
+
 {% if page.layout == 'home' or page.layout == 'post' %}
   {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %}
     <!-- pv-report needs countup.js -->
     <script async src="https://cdn.jsdelivr.net/npm/countup.js@1.9.3/dist/countUp.min.js"></script>
-    <script async src="{{ '/assets/js/dist/pvreport.min.js' | relative_url }}"></script>
+    <script defer src="{{ '/assets/js/dist/pvreport.min.js' | relative_url }}"></script>
   {% endif %}
 {% endif %}
 
 {% if page.layout == 'post' or page.layout == 'page' %}
   <!-- image lazy-loading & popup -->
-  <script async
-    src="https://cdn.jsdelivr.net/combine/npm/lozad/dist/lozad.min.js,npm/magnific-popup@1/dist/jquery.magnific-popup.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/combine/npm/lozad/dist/lozad.min.js,npm/magnific-popup@1/dist/jquery.magnific-popup.min.js"></script>
 {% endif %}
 
 {% if page.layout == 'home'
@@ -50,14 +66,3 @@
     src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js">
   </script>
 {% endif %}
-
-{% if jekyll.environment == 'production' %}
-  <!-- PWA -->
-  <script defer src="{{ '/app.js' | relative_url }}"></script>
-
-  <!-- GA -->
-  {% if site.google_analytics.id %}
-    {% include google-analytics.html %}
-  {% endif %}
-
-{% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 79bfd37..a8c5709 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -46,6 +46,8 @@ layout: compress
 
     {% include search-loader.html %}
 
+    {% include js-selector.html %}
+
   </body>
 
 </html>