profile and entries headers fixed
merged