improve custom header