diff --git a/main.tscn b/main.tscn
index 8c778a3..9725b76 100644
--- a/main.tscn
+++ b/main.tscn
@@ -178,9 +178,9 @@ __meta__ = {
 
 [node name="SSXSlider" type="HSlider" parent="InputHandler"]
 margin_left = 10.0
-margin_top = 160.0
-margin_right = 310.0
-margin_bottom = 156.0
+margin_top = 150.0
+margin_right = 250.0
+margin_bottom = 166.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
@@ -197,9 +197,9 @@ __meta__ = {
 
 [node name="SSYSlider" type="HSlider" parent="InputHandler"]
 margin_left = 10.0
-margin_top = 176.0
-margin_right = 310.0
-margin_bottom = 186.0
+margin_top = 173.0
+margin_right = 250.0
+margin_bottom = 189.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
@@ -224,9 +224,9 @@ __meta__ = {
 }
 
 [node name="FilterSlider" type="HSlider" parent="InputHandler"]
-margin_left = 16.0
+margin_left = 10.0
 margin_top = 218.0
-margin_right = 316.0
+margin_right = 250.0
 margin_bottom = 234.0
 max_value = 1.0
 step = 0.01
diff --git a/scripts/Menu.gd b/scripts/Menu.gd
index f553088..2dbf158 100644
--- a/scripts/Menu.gd
+++ b/scripts/Menu.gd
@@ -468,9 +468,9 @@ func _input(event):
 			elif event.is_action_pressed('ui_left'):
 				selected_song -= 1
 			elif event.is_action_pressed('ui_up'):
-				selected_genre = int(max(0, selected_genre - 1))
+				selected_genre = posmod(selected_genre - 1, len(genres))
 			elif event.is_action_pressed('ui_down'):
-				selected_genre = int(min(len(genres)-1, selected_genre + 1))
+				selected_genre = posmod(selected_genre + 1, len(genres))
 			elif event.is_action_pressed('ui_page_up'):
 				selected_difficulty = int(max(0, selected_difficulty - 1))
 			elif event.is_action_pressed('ui_page_down'):