further improvements to config layout