Cleaning up settings label, and adding port to settings

* Changed "ConnectionSetting" and "Custom Setting" to "Connection Settings"
* Added saving the port