Better config layout