Some HTML cleanup [JOINDIN-321]