Updated INFRA, header and footer