More usable layout for index.
Merge branch 'develop'

* develop:
  More usable layout for index.