Aded core data, UI updates