Tweaks to creating and editing stages