Bug Fixes 0.4 for index.html