@1aurabrown => Fixed problems with collection views and autolayout.

To be honest, the change is an artefact of my troubleshooting – but I do really prefer this style. It just seems more explicit. I can change it back if anyone has strong feels on this.