#47 changing sequence of displaying edit screen and confirm popup