fixed linking issues and form validation bug