Fixed some markup issues