All around layout fixes and playback improve.