fix ui bugs
Merge branch 'CoreDataV2'