More bad HTML tags fixed