Fix cancel button.
fixed conflicts
Cancel button issues.
Merge pull request #11 from jeffChavez/parker

Parker