diff --git a/assets/js/script.js b/assets/js/script.js
index 09b798a..8b01c75 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -27,6 +27,11 @@ grids.forEach(function(grid) {
       // layout Masonry after each image loads
       msnry.layout();
     });
+
+    // layout Masonry after page load
+    $(window).on('load', function() {
+      msnry.layout();
+    });
   }
 });
 
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b6cc36a..9969f20 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+{{ partial "top_button.html" . }}
+
 {{ partial "navigation.html" . }}
 
 {{ partial "bradcrumb.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 488aae6..e56f312 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+{{ partial "top_button.html" . }}
+
 {{ partial "navigation.html" . }}
 
 {{ partial "bradcrumb.html" . }}
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index 6588eb5..b210f71 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -36,7 +36,7 @@
                     {{ end }}
                 </ul>
 
-                {{- if site.IsMultiLingual }}
+                {{- if hugo.IsMultilingual }}
                 <select id="select-language" onchange="location = this.value;">
                     {{ $siteLanguages := site.Languages }}
                     {{ $pageLang := .Page.Lang}}
diff --git a/layouts/static/about.html b/layouts/static/about.html
index 7e0fb8d..3b2f23a 100644
--- a/layouts/static/about.html
+++ b/layouts/static/about.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+{{ partial "top_button.html" . }}
+
 {{ partial "navigation.html" . }}
 
 {{ partial "bradcrumb.html" . }}
diff --git a/layouts/static/portfolio.html b/layouts/static/portfolio.html
index 49663c6..79efc93 100644
--- a/layouts/static/portfolio.html
+++ b/layouts/static/portfolio.html
@@ -1,5 +1,7 @@
 {{ define "main" }}
 
+{{ partial "top_button.html" . }}
+
 {{ partial "navigation.html" . }}
 
 {{ partial "bradcrumb.html" . }}