Add some sectional dividers to config for clarify - re-org order of config for clarity