Rearranged conf layout again