Fix bug#1
Verify bug#1 with amend
Enhancement #2: Improve cancel button
Add initializing class method
refs #3