After you guys fix it, perhaps you should insert breaks to separate genres as well. For example...
-Dance 1-
*list of D1 songs*
-Dance 2-
*List of D2 songs*
-Arcade-
*list of Arcade songs*
And so on
-Dance 1-
*list of D1 songs*
-Dance 2-
*List of D2 songs*
-Arcade-
*list of Arcade songs*
And so on