changed the collection view to main view, made more sense..also some clean-up here and there