Cleanup confirm form.
Merge pull request #134 from sergeyklay/fixes

Cleanup confirm form