Fix for #128
More on issue#94
Fix for #128 plus improvements to stage edit page