Renamed StartupStore to SettingsStore and rejigged a few components