Bug fixes for index.html