iCloud settings no longer crash (well, they're no longer grouped)