Submit and Cancel buttons 'work' better.
Merge pull request #24 from C-Compton/dev

Submit and Cancel buttons 'work' better.