* correctly toggle collapse / expand state * update children visibility Closes #575 Closes #510 review(collapse-expand)