Updated HTML with few bug fixes

Updated HTML with few bug fixes