Basic responsiveness
Merge branch 'responsive'
Make responsiveness work a bit better