Improved header search layout