More work on playback and UI