Fixing form HTML markup