Added Captcha and Input type fields
Fixed consistency