fix header and footer
Merge pull request #297 from deniszgonjanin/master

fix header and footer