Corrected some markup issues