Settings now remember previous server URL. Settings layout updated.
Merge remote-tracking branch 'origin/new-dev' into new-dev