Layout improvement Collection

Mostly @Override, also split up some long lines.
Merge pull request #1480 from pveentjer/improvement/3.x/collection

Layout improvement Collection