Fixed up config, header and footer