Add Public Profile pg, refactor