Added Core Data and fixed some UI