add server settings
Merge branch 'design'