blank email field in settings no longer overwrites email with blank email; other aesthetic fixes