Config layout changes