Various markup errors fixed