Fixing markup madness