Merged index.html changes