Fix header positions