Move page js out to files
Merge branch 'develop'