Merging latest html changes