Fix cancel button issue
Merge pull request #16 from uiri/staging

Fix cancel button issue