Fixed various markup issues