Revert "Fix for #128"

This reverts commit 47bff6ea22dfc66092d34f5646f0118e985236e4.
fix for #128 plus improvements to stage edit page
Merge with upstream
Merge pull request #152 from LisaHelm/master

Fix issues #128, #126, #91, #21