fix markup in custom forms