fixed collapse animation - need more refactoring;