Updated Html5 Input generation