Fixes for collapseall/expandall when scrolled

This is not finished...