Fixed responsivness
Merge branch 'sj-responsive'