Make footer links work
Merge branch 'master' into cosmetics
Merge branch 'cosmetics'