Show which song is playing in the playlist

Also moved a lot of code around between play and playIndex