Clean up initial html
Improve script.js making it a bit more OOP
Merge branch 'develop' into gh-pages