Add some missing HTML tags in various places