fix modal, refactor captcha