Add layout to index page
Merge branch 'master' into mobile