Restructured data so flows from account through customer

[#42860937]
Fix Twitter and Facebook links

[Finishes #41775885]