Aesthetic improved in headers and entities views