Fix 1 to index.html
Fixed second error by adding patch 2
Merged in Fix 2 changes from feauture 1