Rework adding source / collection view controller hierarchy, fix issue with table view being shifted down a bit.