Add html changes and unit test