Correct footer margins so they always line up with content on left edge

Change-Id: Icaa7b267f4232fae2cdd9a869bcf7ac2cd443d5f
Merge "Correct footer margins so they always line up with content on left edge"