Improve header fixed panel composition