Fix strange layout broken things in the conf