Fixed small markup issues