diff --git a/_sass/_nested-nav.scss b/_sass/_nested-nav.scss
index 792d0e98f8..c6de88b547 100644
--- a/_sass/_nested-nav.scss
+++ b/_sass/_nested-nav.scss
@@ -69,6 +69,13 @@
         }
       }
 
+      &:last-child {
+        > ul {
+          right: .5em;
+          left: auto;
+        }
+      }
+
       &:hover {
         > ul {
           display: block;
diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index 93345de3b3..1b8777c477 100755
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -286,7 +286,8 @@ img {
   position: fixed;
   bottom: 30px;
   right: 16px;
-  z-index: 1;
+  z-index: 999;
+
   svg {
     transform: rotate(-90deg);
   }
@@ -515,6 +516,10 @@ p.label {
 // Adds TOC to right hand side in xl layout
 .main-content-wrap {
   width: 100%;
+
+  @include mq(xl) {
+    width: calc(100% - #{$toc-width});
+  }
 }
 
 .toc-wrap {