SongChoose refactored