[Modified media query]
Merge branch 'modified-mq'