fixed some broken cancel buttons on various forms
Merge pull request #449 from unikent/bugs/broken-cancel-buttons

fixed some broken cancel buttons on various forms