I like the solution. So much that I just coded is into my repository.
So 2.0 remains the way it was, 2.1 can get that location.
The only downside is that the collapse buttons will only be available for logged-in users.
How do the others feel about that? Shall I commit it?
If we do not like it, we can always reverse it again...