Validation fixes with accordian