expanding/collapsing cells - improvements