Update config layout

Change-Id: Iafb87c0fa50096575f32f78373b0cd3e209f1e4f