UPDATE: Various markup tweaks in index
Merge branch 'origin/development'