Add margin to footer (merge from master)