Improvements to settings page. I'm getting there slowly...