Improve markup for index