Split the wizards

Make sense, some people may want to disable diagnostics but allow
icloud etc etc