html tidy up and icon additions