diff --git a/Scenes/Menu/level_selector.tscn b/Scenes/Menu/level_selector.tscn
index a926117..2e33052 100644
--- a/Scenes/Menu/level_selector.tscn
+++ b/Scenes/Menu/level_selector.tscn
@@ -70,6 +70,7 @@ margin/right = 897.0
 margin/bottom = 422.0
 scroll/horizontal = false
 scroll/vertical = true
+scroll/deadzone = 0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="VButtonArray/ScrollContainer"]
 
diff --git a/Scenes/Menu/settings.tscn b/Scenes/Menu/settings.tscn
index a03d450..b15c844 100644
--- a/Scenes/Menu/settings.tscn
+++ b/Scenes/Menu/settings.tscn
@@ -75,9 +75,109 @@ focus/stop_mouse = true
 size_flags/horizontal = 2
 size_flags/vertical = 2
 margin/left = 38.0
-margin/top = 35.0
+margin/top = 34.0
 margin/right = 1248.0
-margin/bottom = 693.0
+margin/bottom = 692.0
+
+[node name="VBoxContainer" type="VBoxContainer" parent="Panel"]
+
+anchor/left = 3
+anchor/right = 3
+rect/scale = Vector2( 2, 2 )
+focus/ignore_mouse = false
+focus/stop_mouse = false
+size_flags/horizontal = 2
+size_flags/vertical = 2
+margin/left = 464.0
+margin/top = 109.0
+margin/right = -22.0
+margin/bottom = 291.0
+alignment = 0
+__meta__ = {
+"_edit_group_": true
+}
+
+[node name="CheckButton" type="CheckButton" parent="Panel/VBoxContainer" groups=[
+"set_onscreen_buttons",
+]]
+
+rect/min_size = Vector2( 0, 30 )
+focus/ignore_mouse = false
+focus/stop_mouse = true
+size_flags/horizontal = 2
+size_flags/vertical = 2
+margin/left = 0.0
+margin/top = 0.0
+margin/right = 486.0
+margin/bottom = 30.0
+custom_fonts/font = ExtResource( 1 )
+toggle_mode = true
+enabled_focus_mode = 2
+shortcut = null
+text = "SWITCH_SCREEN_CONTROLS"
+flat = false
+align = 0
+script/script = SubResource( 1 )
+
+[node name="CheckButton1" type="CheckButton" parent="Panel/VBoxContainer"]
+
+rect/min_size = Vector2( 0, 30 )
+focus/ignore_mouse = false
+focus/stop_mouse = true
+size_flags/horizontal = 2
+size_flags/vertical = 2
+margin/left = 0.0
+margin/top = 34.0
+margin/right = 486.0
+margin/bottom = 64.0
+custom_fonts/font = ExtResource( 1 )
+toggle_mode = true
+enabled_focus_mode = 2
+shortcut = null
+text = "SWITCH_RETRO_EFFECT"
+flat = false
+align = 0
+script/script = SubResource( 2 )
+
+[node name="CheckButton2" type="CheckButton" parent="Panel/VBoxContainer"]
+
+rect/min_size = Vector2( 0, 30 )
+focus/ignore_mouse = false
+focus/stop_mouse = true
+size_flags/horizontal = 2
+size_flags/vertical = 2
+margin/left = 0.0
+margin/top = 68.0
+margin/right = 486.0
+margin/bottom = 98.0
+custom_fonts/font = ExtResource( 1 )
+toggle_mode = true
+enabled_focus_mode = 2
+shortcut = null
+text = "SWITCH_MUSIC"
+flat = false
+align = 0
+script/script = SubResource( 3 )
+
+[node name="CheckButton3" type="CheckButton" parent="Panel/VBoxContainer"]
+
+rect/min_size = Vector2( 0, 30 )
+focus/ignore_mouse = false
+focus/stop_mouse = true
+size_flags/horizontal = 2
+size_flags/vertical = 2
+margin/left = 0.0
+margin/top = 102.0
+margin/right = 486.0
+margin/bottom = 132.0
+custom_fonts/font = ExtResource( 1 )
+toggle_mode = true
+enabled_focus_mode = 2
+shortcut = null
+text = "SWITCH_SOUND"
+flat = false
+align = 0
+script/script = SubResource( 4 )
 
 [node name="VButtonArray" type="VButtonArray" parent="Panel"]
 
@@ -94,88 +194,6 @@ button/count = 0
 button/min_button_size = -1.0
 button/align = 1065353216
 
-[node name="CheckButton" type="CheckButton" parent="Panel/VButtonArray" groups=[
-"set_onscreen_buttons",
-]]
-
-rect/scale = Vector2( 2, 2 )
-focus/ignore_mouse = false
-focus/stop_mouse = true
-size_flags/horizontal = 2
-size_flags/vertical = 2
-margin/left = 96.0
-margin/top = -22.0
-margin/right = 502.0
-margin/bottom = 17.0
-custom_fonts/font = ExtResource( 1 )
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-text = "SWITCH_SCREEN_CONTROLS"
-flat = false
-align = 0
-script/script = SubResource( 1 )
-
-[node name="CheckButton1" type="CheckButton" parent="Panel/VButtonArray"]
-
-rect/scale = Vector2( 2, 2 )
-focus/ignore_mouse = false
-focus/stop_mouse = true
-size_flags/horizontal = 2
-size_flags/vertical = 2
-margin/left = 96.0
-margin/top = 54.0
-margin/right = 502.0
-margin/bottom = 93.0
-custom_fonts/font = ExtResource( 1 )
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-text = "SWITCH_RETRO_EFFECT"
-flat = false
-align = 0
-script/script = SubResource( 2 )
-
-[node name="CheckButton2" type="CheckButton" parent="Panel/VButtonArray"]
-
-rect/scale = Vector2( 2, 2 )
-focus/ignore_mouse = false
-focus/stop_mouse = true
-size_flags/horizontal = 2
-size_flags/vertical = 2
-margin/left = 96.0
-margin/top = 134.0
-margin/right = 502.0
-margin/bottom = 173.0
-custom_fonts/font = ExtResource( 1 )
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-text = "SWITCH_MUSIC"
-flat = false
-align = 0
-script/script = SubResource( 3 )
-
-[node name="CheckButton3" type="CheckButton" parent="Panel/VButtonArray"]
-
-rect/scale = Vector2( 2, 2 )
-focus/ignore_mouse = false
-focus/stop_mouse = true
-size_flags/horizontal = 2
-size_flags/vertical = 2
-margin/left = 95.0
-margin/top = 207.0
-margin/right = 501.0
-margin/bottom = 246.0
-custom_fonts/font = ExtResource( 1 )
-toggle_mode = true
-enabled_focus_mode = 2
-shortcut = null
-text = "SWITCH_SOUND"
-flat = false
-align = 0
-script/script = SubResource( 4 )
-
 [node name="Button" parent="Panel/VButtonArray" instance=ExtResource( 2 )]
 
 margin/left = 372.0
@@ -202,12 +220,12 @@ percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 
-[connection signal="toggled" from="Panel/VButtonArray/CheckButton" to="Panel/VButtonArray/CheckButton" method="_on_CheckButton_toggled"]
+[connection signal="toggled" from="Panel/VBoxContainer/CheckButton" to="Panel/VBoxContainer/CheckButton" method="_on_CheckButton_toggled"]
 
-[connection signal="toggled" from="Panel/VButtonArray/CheckButton1" to="Panel/VButtonArray/CheckButton1" method="_on_CheckButton1_toggled"]
+[connection signal="toggled" from="Panel/VBoxContainer/CheckButton1" to="Panel/VBoxContainer/CheckButton1" method="_on_CheckButton1_toggled"]
 
-[connection signal="toggled" from="Panel/VButtonArray/CheckButton2" to="Panel/VButtonArray/CheckButton2" method="_on_CheckButton2_toggled"]
+[connection signal="toggled" from="Panel/VBoxContainer/CheckButton2" to="Panel/VBoxContainer/CheckButton2" method="_on_CheckButton2_toggled"]
 
-[connection signal="toggled" from="Panel/VButtonArray/CheckButton3" to="Panel/VButtonArray/CheckButton3" method="_on_CheckButton3_toggled"]
+[connection signal="toggled" from="Panel/VBoxContainer/CheckButton3" to="Panel/VBoxContainer/CheckButton3" method="_on_CheckButton3_toggled"]