Added HTML 5 input types support and minor clean up