Finalized CoreData and changed some size classes