fixed markup issues