adding expand and collapse