Add cancel button to policy edit form

And get rid of seemingly unnecessary hidden form fields