Improving config layout