Style tweaks
Merge branch 'index'