#6 fixed added event to collapse and expand