Merge branch 'responsive'