reformat lots of html code & add icons