Updates to settings ui
Merge remote-tracking branch 'origin/settings' into settings_listview
Further work to integrate with ServiceList model.