UPDATE: Various markup tweaks in index