Refactor index.html
Additional refactoring