Chris #1 - slightly improves config layout