Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
why not use the padding instead of the footer height here?