fixed event bubbling for onclick, allow disable of expand/contract individually with class