[#4099] Trying to get the markup just right