Fixed a few markup issues