Added checkbox list, modified form validation