diff --git a/Makefile b/Makefile
index af1ddbb066..45985de1e7 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ lint:
 	$(docker) scripts/lint_site.sh
 
 serve:
-	$(docker) scripts/serve_site.sh
+	docker run -t -i --sig-proxy=true --rm -v $(shell pwd):/site -w /site -p 1313:1313 $(img) hugo serve --bind 0.0.0.0 --disableFastRender
 
 netlify:
 	npm install -g html-minifier
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 96c010be24..e6ce43083e 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,6 +1,6 @@
 <footer class="d-print-none container-fluid">
     <div class="row">
-        <div class="col-6 col-lg-4" role="navigation">
+        <div class="col-4 col-lg-4" role="navigation">
             <div class="container-fluid">
                 <div class="row">
                     <div class="icon">
@@ -42,7 +42,7 @@
             </div>
         </div>
 
-        <div class="col-6 col-lg-4">
+        <div class="col-8 col-lg-4">
             <p class="text-center copyright" role="contentinfo">
                 Istio
                 {{ if .Site.Data.args.archive }}
diff --git a/layouts/partials/primary-top.html b/layouts/partials/primary-top.html
index fefec56d66..e72aa5841a 100644
--- a/layouts/partials/primary-top.html
+++ b/layouts/partials/primary-top.html
@@ -19,11 +19,13 @@
             <div class="col-12 col-md-9 col-xl-10">
         {{ end }}
 
-            <p class="d-md-none">
-                <label class="sidebar-toggler" data-toggle="offcanvas">
-                    <i class="fa fa-sign-out-alt"></i>
-                </label>
-            </p>
+            {{ if or $section.Params.sidebar_singlecard $section.Params.sidebar_multicard }}
+                <p class="d-md-none">
+                    <label class="sidebar-toggler" data-toggle="offcanvas">
+                        <i class="fa fa-sign-out-alt"></i>
+                    </label>
+                </p>
+            {{ end }}
 
             <main aria-labelledby="title">
                 <h1 id="title">{{ .Title }}</h1>
diff --git a/scripts/serve_site.sh b/scripts/serve_site.sh
deleted file mode 100755
index 7756336be3..0000000000
--- a/scripts/serve_site.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-hugo serve --disableFastRender