Add collapse boxes. Fix #1