prepared for Core Data and fixed header title bug