Updating header and footer with new functions
Bugfix