Undoing doesn't work properly after moving images around

[nicoburns]

In particular the UI elements show up in the wrong place...