diff --git a/scss/layout/_core.scss b/scss/layout/_core.scss
index 29b2f6f51..4b95dfc62 100644
--- a/scss/layout/_core.scss
+++ b/scss/layout/_core.scss
@@ -12,6 +12,10 @@ body {
   text-rendering: optimizeLegibility;
   font-feature-settings: "liga" 0;
 
+  * {
+    @include scrollbar;
+  }
+
   @media print {
     background: transparent;
   }
diff --git a/scss/layout/_layout.scss b/scss/layout/_layout.scss
index 78c858701..8a9154b48 100644
--- a/scss/layout/_layout.scss
+++ b/scss/layout/_layout.scss
@@ -128,8 +128,8 @@ Top nav
   border-color: $navbar-border-color;
   position: absolute;
   top: 0;
+  right: 0;
   left: 0;
-  width: 100vw;
   padding: 0 .5rem;
   z-index: $zindex-sticky;
   min-height: $navbar-height;
diff --git a/scss/mixins/_mixins.scss b/scss/mixins/_mixins.scss
index 47fb28e10..5b547fd26 100644
--- a/scss/mixins/_mixins.scss
+++ b/scss/mixins/_mixins.scss
@@ -10,31 +10,31 @@
 }
 
 @mixin scrollbar($is-dark: false) {
-  //&::-webkit-scrollbar {
-  //  width: 6px;
-  //  height: 6px;
-  //  transition: .3s background;
-  //}
-  //
-  //&::-webkit-scrollbar-thumb {
-  //  border-radius: 5px;
-  //
-  //  @if ($is-dark) {
-  //    background: transparent;
-  //  } @else {
-  //    background: $gray-400;
-  //  }
-  //}
-  //
-  //&:hover::-webkit-scrollbar-thumb {
-  //  background: $gray-500;
-  //
-  //  @if ($is-dark) {
-  //    background: mix(#fff, $dark, 20%);
-  //  } @else {
-  //    background: $gray-500;
-  //  }
-  //}
+  &::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    transition: .3s background;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    border-radius: 5px;
+
+    @if ($is-dark) {
+      background: transparent;
+    } @else {
+      background: $gray-400;
+    }
+  }
+
+  &:hover::-webkit-scrollbar-thumb {
+    background: $gray-500;
+
+    @if ($is-dark) {
+      background: mix(#fff, $dark, 20%);
+    } @else {
+      background: $gray-500;
+    }
+  }
 }
 
 @mixin dark {