Adjust comment headers in Core Layout