Add PBs edit profile
Merge branch 'peter2' into next

Merge Peters edit profile