Add new classes and change preferences to use collection view