Improve footer and header