added accordian and fixed event handlers