Added validation and replaced email display with names