Some cleaning up to the views. Yet to add types to email/weburl such as home, work, other.