Fixing bad markup