Settingsfix

Settings page (more or less) complete.  See specific commit logs for more info.