Tweaked the way the edit mode is presented