Catchup w/my branch

Was showing the app to someone and noticed the audio playback caused a crash on my older phone. When making this pull request I now see why grid view wasn't working for you on iPad ;-)