added collapse and expand