Restyle header/footer.
Merge styling to master. Add header/footer