Attempt to get the markup right