Collection view layout cleanup.