Adds margin to footer
Merge branch 'slave'