Improve header responsiveness

@zaccolley can you take a look at this?