diff --git a/JavaApp/src/main/java/org/lwjgl/opengl/GLFWInputImplementation.java b/JavaApp/src/main/java/org/lwjgl/input/GLFWInputImplementation.java
similarity index 97%
rename from JavaApp/src/main/java/org/lwjgl/opengl/GLFWInputImplementation.java
rename to JavaApp/src/main/java/org/lwjgl/input/GLFWInputImplementation.java
index 308899cf..ed775b99 100644
--- a/JavaApp/src/main/java/org/lwjgl/opengl/GLFWInputImplementation.java
+++ b/JavaApp/src/main/java/org/lwjgl/input/GLFWInputImplementation.java
@@ -178,7 +178,6 @@ public class GLFWInputImplementation implements InputImplementation {
         last_event_nanos = nanos;
     }
     public void putKeyboardEvent(int keycode, byte state, int ch, long nanos, boolean repeat) {
-        //System.out.println("LWJGL2: debug keyboard=" + keycode + ", state=" + state + ", repeat=" + repeat);
         key_down_buffer[keycode] = state;
         keyboardEvent.clear();
         keyboardEvent.putInt(keycode).put(state).putInt(ch).putLong(nanos).put(repeat ? (byte)1 : (byte)0);
diff --git a/Natives/LauncherNavigationController.m b/Natives/LauncherNavigationController.m
index c029acd2..47f3f58e 100644
--- a/Natives/LauncherNavigationController.m
+++ b/Natives/LauncherNavigationController.m
@@ -18,6 +18,8 @@
 @interface LauncherNavigationController () <UIDocumentPickerDelegate, UIPickerViewDataSource, UIPickerViewDelegate, UIPopoverPresentationControllerDelegate> {
 }
 
+@property(nonatomic) UIView* fakeToolbar;
+
 @property(nonatomic) NSMutableArray* versionList;
 
 @property(nonatomic) UIPickerView* versionPickerView;
@@ -76,9 +78,11 @@
         targetToolbar = self.toolbar;
     } else { // iOS 13.x and 12.x
         // Workaround user interaction issue by using a fake toolbar
-        targetToolbar = [[UIView alloc] initWithFrame:self.toolbar.frame];
+        CGRect frame = self.toolbar.frame;
+        frame.origin.y -= frame.size.height;
+        self.fakeToolbar = [[UIView alloc] initWithFrame:frame];
+        targetToolbar = self.fakeToolbar;
         targetToolbar.autoresizingMask = self.toolbar.autoresizingMask;
-        [self.view addSubview:targetToolbar];
     }
 
     [targetToolbar addSubview:self.versionTextField];
@@ -126,6 +130,13 @@
     self.navigationBar.prefersLargeTitles = YES;
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    if (self.fakeToolbar != nil) {
+        // Make this view appear on top of the real one
+        [self.view addSubview:self.fakeToolbar];
+    }
+}
+
 - (BOOL)isVersionInstalled:(NSString *)versionId
 {
     NSString *localPath = [NSString stringWithFormat:@"%s/versions/%@", getenv("POJAV_GAME_DIR"), versionId];
diff --git a/Natives/LauncherPreferencesViewController.m b/Natives/LauncherPreferencesViewController.m
index efd07a9f..2096c109 100644
--- a/Natives/LauncherPreferencesViewController.m
+++ b/Natives/LauncherPreferencesViewController.m
@@ -238,6 +238,11 @@ typedef void(^CreateView)(UITableViewCell *, NSString *, NSDictionary *);
                 @"hasDetail": @YES,
                 @"type": self.typeSwitch,
             },
+            @{@"key": @"slideable_hotbar",
+                @"hasDetail": @YES,
+                @"icon": @"slider.horizontal.below.rectangle",
+                @"type": self.typeSwitch
+            },
             @{@"key": @"press_duration",
                 @"hasDetail": @YES,
                 @"icon": @"cursorarrow.click.badge.clock",