Tidy up DAP
Added a first cut contacts process
Tidy up layout and feedback