Check payment method should respond to cancel. Fixes #5307
Improve the presentation during creating prototypes. Fixes #2526
No need for partial. Fixes #5475