Add ID to submit button & cleanup page