Simplefy index page layout
Merge branch 'develop'