Added Cancel buttons to the forms and cleaned up their layout.