Bug Fixes for index.html