Applied same modifications as on index.html