diff --git a/wowchemy/layouts/partials/book_sidebar.html b/wowchemy/layouts/partials/book_sidebar.html
index 4bf01edc..f95fb5f4 100644
--- a/wowchemy/layouts/partials/book_sidebar.html
+++ b/wowchemy/layouts/partials/book_sidebar.html
@@ -1,10 +1,21 @@
 <form class="docs-search d-flex align-items-center">
-  <button class="btn docs-toggle d-md-none p-0 mr-3" type="button" data-toggle="collapse" data-target="#docs-nav" aria-controls="docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
-    <span><i class="fas fa-bars"></i></span>
+  <button class="btn docs-toggle d-md-none p-0 mr-md-3 w-100" type="button" data-toggle="collapse" data-target="#docs-nav" aria-controls="docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
+    <div class="d-flex">
+      <span class="d-md-none pl-1 flex-grow-1 text-left overflow-hidden">
+        {{ if .Parent | and .Parent.IsHome }}
+          {{ .LinkTitle | emojify }}
+        {{ else if .Parent | and (not .Parent.IsHome) }}
+          {{ .Parent.LinkTitle | emojify }}
+        {{ else }}
+          {{ (i18n "home" | default "Home") | emojify }}
+        {{ end }}
+      </span>
+      <span><i class="fas fa-chevron-down"></i></span>
+    </div>
   </button>
 
   {{ if eq site.Params.search.engine 1 }}
-  <button class="form-control sidebar-search js-search">
+  <button class="form-control sidebar-search js-search d-none d-md-flex">
     <i class="fas fa-search pr-2"></i>
     <span class="sidebar-search-text">{{ i18n "search_placeholder" }}</span>
     <span class="sidebar-search-shortcut">/</span>
diff --git a/wowchemy/layouts/partials/breadcrumb.html b/wowchemy/layouts/partials/breadcrumb.html
index 1545aa38..2a8625e2 100644
--- a/wowchemy/layouts/partials/breadcrumb.html
+++ b/wowchemy/layouts/partials/breadcrumb.html
@@ -1,9 +1,9 @@
 {{ if not .IsHome }}
-  <nav aria-label="breadcrumb">
+  <nav class="d-none d-md-flex" aria-label="breadcrumb">
     <ol class="breadcrumb">
       {{ partial "breadcrumb_helper" . }}
       <li class="breadcrumb-item active" aria-current="page">
-        {{ (.LinkTitle | default .Title) | emojify }}
+        {{ .LinkTitle | emojify }}
       </li>
     </ol>
   </nav>
diff --git a/wowchemy/layouts/partials/breadcrumb_helper.html b/wowchemy/layouts/partials/breadcrumb_helper.html
index 4cb821d2..073a9724 100644
--- a/wowchemy/layouts/partials/breadcrumb_helper.html
+++ b/wowchemy/layouts/partials/breadcrumb_helper.html
@@ -3,9 +3,9 @@
   <li class="breadcrumb-item">
     <a href="{{ .RelPermalink }}">
       {{ if .IsHome }}
-        {{ i18n "home" | default "Home" }}
+        {{ (i18n "home" | default "Home") | emojify }}
       {{ else }}
-        {{ (.LinkTitle | default .Title) | emojify }}
+        {{ .LinkTitle | emojify }}
       {{ end }}
     </a>
   </li>
diff --git a/wowchemy/layouts/partials/navbar.html b/wowchemy/layouts/partials/navbar.html
index f55567ab..d3c04c39 100644
--- a/wowchemy/layouts/partials/navbar.html
+++ b/wowchemy/layouts/partials/navbar.html
@@ -14,7 +14,7 @@
 {{ end }}
 
 <nav class="navbar navbar-expand-lg navbar-light compensate-for-scrollbar" id="navbar-main">
-  <div class="container">
+  <div class="container-xl">
 
     {{if $show_logo}}
     <div class="d-none d-lg-inline-flex">