Bug Fixes 0.5 for index.html