Some configuration updates with the new layout