Tweak _header style
Fix merging conflict