Made expand-and-collapse work; something's wrong with no. 7