Use more partial and dynamic header