Structural changes to playview and other small changes.