expander bugfixes
Improve collapse animation