index and sidebar layout revision
Merge branch 'release/1.1.0' into prod