Failed test: All collection text visible

The fix is quite small, noted below.
The rest is styling changes as the content was squashed after recent refactor.