more fixes, but still buggy

first line in collection view goes down two lines worth