diff --git a/assets/src/ba_data/python/bastd/ui/settings/controls.py b/assets/src/ba_data/python/bastd/ui/settings/controls.py
index 283be4d3..a59e39ba 100644
--- a/assets/src/ba_data/python/bastd/ui/settings/controls.py
+++ b/assets/src/ba_data/python/bastd/ui/settings/controls.py
@@ -59,7 +59,7 @@ class ControlsSettingsWindow(ba.Window):
         self._r = 'configControllersWindow'
         app = ba.app
 
-        is_fire_tv = _ba.is_running_on_fire_tv()
+        # is_fire_tv = _ba.is_running_on_fire_tv()
 
         spacing = 50.0
         button_width = 350.0
@@ -110,17 +110,17 @@ class ControlsSettingsWindow(ba.Window):
             show_remote = False
 
         show_ps3 = False
-        if platform == 'mac':
-            show_ps3 = True
-            height += spacing
+        # if platform == 'mac':
+        #     show_ps3 = True
+        #     height += spacing
 
         show360 = False
-        if platform == 'mac' or is_fire_tv:
-            show360 = True
-            height += spacing
+        # if platform == 'mac' or is_fire_tv:
+        #     show360 = True
+        #     height += spacing
 
         show_mac_wiimote = False
-        if platform == 'mac':
+        if platform == 'mac' and subplatform == 'appstore':
             show_mac_wiimote = True
             height += spacing
 
@@ -135,7 +135,7 @@ class ControlsSettingsWindow(ba.Window):
         # (we can run into problems where devices register as one of each
         # type otherwise)..
         show_mac_controller_subsystem = False
-        if platform == 'mac':
+        if platform == 'mac' and subplatform == 'appstore':
             show_mac_controller_subsystem = True
 
         if show_mac_controller_subsystem:
diff --git a/assets/src/ba_data/python/bastd/ui/settings/keyboard.py b/assets/src/ba_data/python/bastd/ui/settings/keyboard.py
index 61f02ae2..8796bc4c 100644
--- a/assets/src/ba_data/python/bastd/ui/settings/keyboard.py
+++ b/assets/src/ba_data/python/bastd/ui/settings/keyboard.py
@@ -54,7 +54,7 @@ class ConfigKeyboardWindow(ba.Window):
             size=(self._width, self._height),
             scale=(1.6 if uiscale is ba.UIScale.SMALL else
                    1.3 if uiscale is ba.UIScale.MEDIUM else 1.0),
-            stack_offset=(0, -10) if uiscale is ba.UIScale.SMALL else (0, 0),
+            stack_offset=(0, 5) if uiscale is ba.UIScale.SMALL else (0, 0),
             transition=transition))
 
         self._rebuild_ui()
@@ -123,7 +123,7 @@ class ConfigKeyboardWindow(ba.Window):
                           color=ba.app.infotextcolor,
                           h_align='center',
                           v_align='top')
-            v -= 45
+            v -= 40
         v -= 10
         v -= self._spacing * 2.2
         v += 25