Fix footer for now. Hacky but works
Merge branch 'footer'
Merge footer fix into master