Move header styles to substyle; style tweaks