improving markup for config domain forms