Clean up settings declaration

Also introducing network main settings section