Drop down list populated
Updated code that was lost in merge
Fixing errors from merge regarding Pi playback
Merged upstream