updated endpage
updated urls
Merge branch 'master' into remixupdate