Footer fixed
Merge branch 'footer-fixes' into develop