Cleanup and switch to switch for labs in prefs.
Removed email input from general prefs.