Bug Fixes 1.1 for index.html