Change presentation of contacts 50
Re structure sources as well 60
Reorganize new structure for sources and contacts 30