Fix HTML bugs