Definitely agree, the collapse should now be prefixed and the voting should be moved elsewhere.

This design was the minimum change possible (which has a value, but usually a net negative one).