The new Advanced mode allow you to add song numbers to the scene or locator name, each song is then grouped together with the top half of the button matrix selecting the song and the bottom half available to trigger the scenes or locators within the song.