Fix for #128 plus improvements to stage edit page