change to SPA, update functions
merge conflict resolution, SPA @ index.html