Adjustments to works on chrome browser
Resolve conflict on index.html