Changed more hardcoded HTML to use the Html class

Change-Id: I24d0080d81984a99b07bd95bd22613dc14a537a9
(cherry picked from commit 26fff94732f9f8aaed8bfcd27306a3d34be0a375)