More changes to the markup