Base: Fix HTML syntax issues