fixed collapse and expand