Few more header/footer tweaks.