Changed back collapsing folders.

I'll change this back next week and look to fix the problems we're having, but for now this should fix the bugs.