Update the index layout
Merge branch 'develop'