Fixing the markup