Submit and Cancel buttons added.
Merge branch 'usage_dev_branch' of https://github.com/open-infinity/cmt.git into usage_dev_branch