Adjust config site, and re-arrange header include