Make index display correctly on iPhone
Merge branch 'edge'