Fix footer width and internal margins
Merge branch 'footer'