Merge some positioning fixes (footer)