Added fixed header as a parameter
Merge branch 'refs/heads/feature-infopages'