WIP new configuration layout