Fixed expand, still need to fix collapse