Update config to new layout