Fixed markup issues in subpages