Add to Public Profile pg, refactor