diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java
index bd65fa72..98f13c82 100644
--- a/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java
+++ b/cameraview/src/main/java/com/otaliastudios/cameraview/engine/Camera2Engine.java
@@ -70,6 +70,7 @@ import com.otaliastudios.cameraview.size.Size;
 import com.otaliastudios.cameraview.video.Full2VideoRecorder;
 import com.otaliastudios.cameraview.video.SnapshotVideoRecorder;
 
+import java.io.FileDescriptor;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/docs/_config.yml b/docs/_config.yml
index cf95612a..85b86f6d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -13,6 +13,7 @@ google_site_verification: '4x49i17ABIrSvUl52SeL0-t0341aTnWWaC62-FYCRT4'
 github: [metadata] # TODO What's this?
 github_repo: CameraView
 github_version: 2.6.0
+github_branch: master
 donateurl: '/extra/donate' # relative URL for donations, used in footer.html
 baseurl: '/CameraView' # Keep as an empty string if served up at the root
 sections: [
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html
index b2b2fd29..79227e48 100644
--- a/docs/_layouts/page.html
+++ b/docs/_layouts/page.html
@@ -4,8 +4,27 @@ layout: main
 
 <div class="page-header border-bottom has-divider pb-3">
     <h1 class="d-inline-block mt-1 mb-0 mr-2">{{ page.title }}</h1>
-    {% if page.description %}<span>{{ page.description }}</span>{% endif %}
+    {% if page.description %}<span class="mr-2">{{ page.description }}</span>{% endif %}
+    <span><a href="https://github.com/{{ site.author.github }}/{{ site.github_repo }}/edit/{{ site.github_branch }}/docs/{{ page.path }}">[edit this page]</a></span>
 </div>
-<div class="page mt-4">
+<div class="page my-4">
     {{ content }}
 </div>
+<div class="page-footer border-top has-divider">
+    <div class="row text-center">
+        {% assign next = page.order | plus: 1 %}
+        {% assign previous = page.order | minus: 1 %}
+        {% for other in site.categories[page.category] %}
+        {% if other.order == previous %}
+        <a class="previous col mt-3" href="{{ site.baseurl }}{{ other.url }}">< {{ other.title }}</a>
+        {% endif %}
+        {% endfor %}
+
+        {% for other in site.categories[page.category] %}
+        {% if other.order == next %}
+        <a class="next col mt-3" href="{{ site.baseurl }}{{ other.url }}">{{ other.title }} ></a>
+        {% endif %}
+        {% endfor %}
+    </div>
+</div>
+
diff --git a/docs/css/main.css b/docs/css/main.css
index 1898b811..f7c00668 100644
--- a/docs/css/main.css
+++ b/docs/css/main.css
@@ -77,13 +77,11 @@ footer {
 
 /* drawer */
 
-.drawer-toggle {
-    background-color: transparent;
-    border-radius: 50%;
-}
-
-.drawer-toggle:hover {
-    background-color: rgba(240, 240, 240, 0.25);
+@media (hover: hover) {
+    .drawer-toggle:hover {
+        background-color: rgba(240, 240, 240, 0.15);
+        border-radius: 50%;
+    }
 }
 
 @media (max-width: 768px) {
@@ -236,6 +234,13 @@ td {
     color: var(--color-text-muted);
 }
 
+.page-footer a {
+    color: black;
+    font-family: var(--font-display), cursive;
+    font-weight: 700;
+    font-size: 1.2em;
+}
+
 /* code */
 
 pre {
@@ -252,11 +257,11 @@ pre {
     font-size: 0.8rem !important;
 }
 
-.language-java, .language-xml, .language-groovy {
+.language-java, .language-xml, .language-kotlin, .language-groovy {
     position: relative;
 }
 
-.language-java::after, .language-xml::after, .language-groovy::after {
+.language-java::after, .language-xml::after, .language-kotlin::after, .language-groovy::after {
     position: absolute;
     top: 0;
     right: 0;
@@ -276,3 +281,7 @@ pre {
 .language-groovy::after {
     content: 'groovy';
 }
+
+.language-kotlin::after {
+    content: 'kotlin';
+}