improve display + email