Close / Cancel Buttons

Would it be possible to have the option of placing a cancel button in the form, alongside the submit one?

Also, the modal x in the top right looks a bit weird and I think placing it inside the window would look better. I can modify the form php to achieve this, but that will obviously get lost if I update the plugin, so is there an alternative way of doing so?