Improving headers design