Add to YouTube pg, refactor