fixed validation and accessibility issues