Index.html refactored