fixing markup issues