Playback and layout of Edit fixed

Lots of copied code!