Make headers more hierarchical