Added new CollectionLayout and some other minor changes