Re add margin and fix footer