Changes in connection activity & settings activity

- Changes in connection activity
- Changes in settings activity