Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs