Fixing markup issues