Entity header layout cleanup

Change-Id: I866231e3a6cb506e3aa1c03f2cbead1049270999
Fix: 63339943
Test: visual
2 files changed