ENTESB-1522: Readded html changes that were removed by previous revert